From f6b2acd608cb556cc6131d2f2295105e7de9d94e Mon Sep 17 00:00:00 2001
From: Michael Sawyer <source@isc.org>
Date: Wed, 11 Oct 2000 18:00:08 +0000
Subject: [PATCH] Minor change to make GNS changes easier, as well as a minor
 typo.

---
 bin/named/query.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/named/query.c b/bin/named/query.c
index cd326327b5..68b98c3cf4 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.135 2000/10/11 17:44:05 mws Exp $ */
+/* $Id: query.c,v 1.136 2000/10/11 18:00:08 mws Exp $ */
 
 #include <config.h>
 
@@ -690,7 +690,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, unsigned int options,
 {
 	isc_result_t result;
 
-#ifdef DNS_OPT_NEWCODES
+#ifdef DNS_OPT_NEWCODES_LIVE
 	if (client->opt_zone != NULL) {
 		result = query_getzonedb(client, &(client->opt_zone->name),
 					 options, zonep, dbp, versionp);
@@ -708,7 +708,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, unsigned int options,
 			*is_zonep = ISC_FALSE;
 		}
 	}
-#else /* DNS_OPT_NEWCODES */
+#else /* DNS_OPT_NEWCODES_LIVE */
 	result = query_getzonedb(client, name, options, zonep, dbp, versionp);
 	if (result == ISC_R_SUCCESS) {
 		*is_zonep = ISC_TRUE;
@@ -716,7 +716,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, unsigned int options,
 		result = query_getcachedb(client, dbp, options);
 		*is_zonep = ISC_FALSE;
 	}
-#endif /* DNS_OPT_NEWCODES */
+#endif /* DNS_OPT_NEWCODES_LIVE */
 	return (result);
 }
 
@@ -2343,11 +2343,11 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
 		 */
 		break;
 	case DNS_R_GLUE:
-#ifdef DNS_OPT_NEWCODES
+#ifdef DNS_OPT_NEWCODES_LIVE
 		if (client->opt_zone != NULL)
 			break;
 		/* Fallthrough if we don't have opt_zone */
-#endif DNS_OPT_NEWCODES
+#endif /* DNS_OPT_NEWCODES_LIVE */ 
 	case DNS_R_ZONECUT:
 		/*
 		 * These cases are handled in the main line below.
@@ -2356,13 +2356,13 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
 		authoritative = ISC_FALSE;
 		break;
 	case ISC_R_NOTFOUND:
-#ifdef DNS_OPT_NEWCODES
+#ifdef DNS_OPT_NEWCODES_LIVE
 		/*
 		 * If we've passed in opt_zone, don't try anything more.
 		 */
 		if (client->opt_zone != NULL)
 			break;
-#endif /* DNS_OPT_NEWCODES */
+#endif /* DNS_OPT_NEWCODES_LIVE */
 		/*
 		 * The cache doesn't even have the root NS.  Get them from
 		 * the hints DB.
@@ -2388,14 +2388,14 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
 		 */
 		/* FALLTHROUGH */
 	case DNS_R_DELEGATION:
-#ifdef DNS_OPT_NEWCODES
+#ifdef DNS_OPT_NEWCODES_LIVE
 		/*
 		 * If we've passed in opt_zone, don't try anything more.
 		 */
 		if (client->opt_zone != NULL) {
 			break;
 		}
-#endif /* DNS_OPT_NEWCODES */
+#endif /* DNS_OPT_NEWCODES_LIVE */
 		authoritative = ISC_FALSE;
 		if (is_zone) {
 			/*