fix bad NSID/EDNS interaction [RT #17952]

lib/dns/resolver.c

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.367 2008/04/07 05:32:52 marka Exp $ */
+/* $Id: resolver.c,v 1.368 2008/04/10 07:20:11 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