From: Mark Andrews <marka@isc.org>
Date: Thu, 10 Apr 2008 07:20:27 +0000 (+0000)
Subject: fix bad NSID/EDNS interaction [RT #17952]
X-Git-Tag: v9.5.0b3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f73d33c2573c5be8447e1e15d31728fdbcfb90;p=thirdparty%2Fbind9.git

fix bad NSID/EDNS interaction [RT #17952]
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 90f86f4cd6a..c5f06145168 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.355.12.12 2008/04/07 05:30:58 marka Exp $ */
+/* $Id: resolver.c,v 1.355.12.13 2008/04/10 07:20:27 marka Exp $ */
 
 /*! \file */
 
@@ -1600,7 +1600,7 @@ resquery_send(resquery_t *query) {
 					     udpsize, reqnsid);
 			if (reqnsid && result == ISC_R_SUCCESS) {
 				query->options |= DNS_FETCHOPT_WANTNSID;
-			} else {
+			} else if (result != ISC_R_SUCCESS) {
 				/*
 				 * We couldn't add the OPT, but we'll press on.
 				 * We're not using EDNS0, so set the NOEDNS0