Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bind/patches/15912313.nslookup-revert.patch
author tomas.jedlicka <tomas.jedlicka@oracle.com>
Fri, 21 Dec 2012 12:13:01 +0100
changeset 1092 7c07ade6305a
permissions -rw-r--r--
15912313 nslookup return value breaks Oracle DB for RAC install
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1092
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     1
 
--- a/bin/dig/nslookup.c	Fri Dec 21 12:02:39 2012
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     2
 
+++ b/bin/dig/nslookup.c	Fri Dec 21 12:03:43 2012
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     3
 
@@ -57,7 +57,6 @@
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     4
 
 static char defclass[MXRD] = "IN";
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     5
 
 static char deftype[MXRD] = "A";
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     6
 
 static isc_event_t *global_event = NULL;
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     7
 
-static int query_error = 1, print_error = 0;
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     8
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
     9
 
 static char domainopt[DNS_NAME_MAXTEXT];
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    10
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    11
 
@@ -407,9 +406,6 @@
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    12
 
 printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    13
 
 	char servtext[ISC_SOCKADDR_FORMATSIZE];
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    14
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    15
 
-	/* I've we've gotten this far, we've reached a server. */
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    16
 
-	query_error = 0;
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    17
 
-
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    18
 
 	debug("printmessage()");
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    19
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    20
 
 	isc_sockaddr_format(&query->sockaddr, servtext, sizeof(servtext));
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    21
 
@@ -437,9 +433,6 @@
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    22
 
 		       (msg->rcode != dns_rcode_nxdomain) ? nametext :
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    23
 
 		       query->lookup->textname, rcode_totext(msg->rcode));
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    24
 
 		debug("returning with rcode == 0");
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    25
 
-
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    26
 
-		/* the lookup failed */
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    27
 
-		print_error |= 1;
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    28
 
 		return (ISC_R_SUCCESS);
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    29
 
 	}
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    30
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    31
 
@@ -910,5 +903,5 @@
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    32
 
 	destroy_libs();
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    33
 
 	isc_app_finish();
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    34
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    35
 
-	return (query_error | print_error);
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    36
 
+	return (0);
7c07ade6305a 15912313 nslookup return value breaks Oracle DB for RAC install
tomas.jedlicka <tomas.jedlicka@oracle.com>
parents:
diff changeset 
    37
 
 }
upstream/oracle/userland-gate