fix bad NSID/EDNS interaction [RT #17952]

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 90f86f4cd6a02ef0f348fbe9bfb91965161038dc..c5f061451686bdfa063ca56b835c402ac3729466 100644 (file)
--- 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