17374438 bug fix 15912313 needs to be removed s11-update
authorBen Chang <Benjamin.Chang@Oracle.COM>
Wed, 28 Aug 2013 23:47:41 -0700
branchs11-update
changeset 2756 b74a19d95214
parent 2754 da1498ba96f6
child 2757 26208da24bdf
17374438 bug fix 15912313 needs to be removed
components/bind/patches/15912313.nslookup-revert.patch
--- a/components/bind/patches/15912313.nslookup-revert.patch	Wed Aug 28 10:17:10 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
---- a/bin/dig/nslookup.c	Fri Dec 21 12:02:39 2012
-+++ b/bin/dig/nslookup.c	Fri Dec 21 12:03:43 2012
[email protected]@ -57,7 +57,6 @@
- static char defclass[MXRD] = "IN";
- static char deftype[MXRD] = "A";
- static isc_event_t *global_event = NULL;
--static int query_error = 1, print_error = 0;
- 
- static char domainopt[DNS_NAME_MAXTEXT];
- 
[email protected]@ -407,9 +406,6 @@
- printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
- 	char servtext[ISC_SOCKADDR_FORMATSIZE];
- 
--	/* I've we've gotten this far, we've reached a server. */
--	query_error = 0;
--
- 	debug("printmessage()");
- 
- 	isc_sockaddr_format(&query->sockaddr, servtext, sizeof(servtext));
[email protected]@ -437,9 +433,6 @@
- 		       (msg->rcode != dns_rcode_nxdomain) ? nametext :
- 		       query->lookup->textname, rcode_totext(msg->rcode));
- 		debug("returning with rcode == 0");
--
--		/* the lookup failed */
--		print_error |= 1;
- 		return (ISC_R_SUCCESS);
- 	}
- 
[email protected]@ -910,5 +903,5 @@
- 	destroy_libs();
- 	isc_app_finish();
- 
--	return (query_error | print_error);
-+	return (0);
- }