components/bind/patches/15912313.nslookup-revert.patch
branchs11-update
changeset 2454 82b8521a2f38
equal deleted inserted replaced
2452:9dc4dfa4b04d 2454:82b8521a2f38
       
     1 --- a/bin/dig/nslookup.c	Fri Dec 21 12:02:39 2012
       
     2 +++ b/bin/dig/nslookup.c	Fri Dec 21 12:03:43 2012
       
     3 @@ -57,7 +57,6 @@
       
     4  static char defclass[MXRD] = "IN";
       
     5  static char deftype[MXRD] = "A";
       
     6  static isc_event_t *global_event = NULL;
       
     7 -static int query_error = 1, print_error = 0;
       
     8  
       
     9  static char domainopt[DNS_NAME_MAXTEXT];
       
    10  
       
    11 @@ -407,9 +406,6 @@
       
    12  printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
       
    13  	char servtext[ISC_SOCKADDR_FORMATSIZE];
       
    14  
       
    15 -	/* I've we've gotten this far, we've reached a server. */
       
    16 -	query_error = 0;
       
    17 -
       
    18  	debug("printmessage()");
       
    19  
       
    20  	isc_sockaddr_format(&query->sockaddr, servtext, sizeof(servtext));
       
    21 @@ -437,9 +433,6 @@
       
    22  		       (msg->rcode != dns_rcode_nxdomain) ? nametext :
       
    23  		       query->lookup->textname, rcode_totext(msg->rcode));
       
    24  		debug("returning with rcode == 0");
       
    25 -
       
    26 -		/* the lookup failed */
       
    27 -		print_error |= 1;
       
    28  		return (ISC_R_SUCCESS);
       
    29  	}
       
    30  
       
    31 @@ -910,5 +903,5 @@
       
    32  	destroy_libs();
       
    33  	isc_app_finish();
       
    34  
       
    35 -	return (query_error | print_error);
       
    36 +	return (0);
       
    37  }