mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

Minor change to make GNS changes easier, as well as a minor typo.

Browse Source
This commit is contained in:
Michael Sawyer 2000-10-11 18:00:08 +00:00
parent 303ca7abc9
commit f6b2acd608
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/named/query.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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> #include <config.h>
@ -690,7 +690,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, unsigned int options,
{ {
isc_result_t result; isc_result_t result;
#ifdef DNS_OPT_NEWCODES #ifdef DNS_OPT_NEWCODES_LIVE
if (client->opt_zone != NULL) { if (client->opt_zone != NULL) {
result = query_getzonedb(client, &(client->opt_zone->name), result = query_getzonedb(client, &(client->opt_zone->name),
options, zonep, dbp, versionp); 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; *is_zonep = ISC_FALSE;
} }
} }
#else /* DNS_OPT_NEWCODES */ #else /* DNS_OPT_NEWCODES_LIVE */
result = query_getzonedb(client, name, options, zonep, dbp, versionp); result = query_getzonedb(client, name, options, zonep, dbp, versionp);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
*is_zonep = ISC_TRUE; *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); result = query_getcachedb(client, dbp, options);
*is_zonep = ISC_FALSE; *is_zonep = ISC_FALSE;
} }
#endif /* DNS_OPT_NEWCODES */ #endif /* DNS_OPT_NEWCODES_LIVE */
return (result); return (result);
} }
@ -2343,11 +2343,11 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
*/ */
break; break;
case DNS_R_GLUE: case DNS_R_GLUE:
#ifdef DNS_OPT_NEWCODES #ifdef DNS_OPT_NEWCODES_LIVE
if (client->opt_zone != NULL) if (client->opt_zone != NULL)
break; break;
/* Fallthrough if we don't have opt_zone */ /* Fallthrough if we don't have opt_zone */
#endif DNS_OPT_NEWCODES #endif /* DNS_OPT_NEWCODES_LIVE */
case DNS_R_ZONECUT: case DNS_R_ZONECUT:
/* /*
* These cases are handled in the main line below. * 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; authoritative = ISC_FALSE;
break; break;
case ISC_R_NOTFOUND: 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 we've passed in opt_zone, don't try anything more.
*/ */
if (client->opt_zone != NULL) if (client->opt_zone != NULL)
break; break;
#endif /* DNS_OPT_NEWCODES */ #endif /* DNS_OPT_NEWCODES_LIVE */
/* /*
* The cache doesn't even have the root NS. Get them from * The cache doesn't even have the root NS. Get them from
* the hints DB. * the hints DB.
@ -2388,14 +2388,14 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
*/ */
/* FALLTHROUGH */ /* FALLTHROUGH */
case DNS_R_DELEGATION: 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 we've passed in opt_zone, don't try anything more.
*/ */
if (client->opt_zone != NULL) { if (client->opt_zone != NULL) {
break; break;
} }
#endif /* DNS_OPT_NEWCODES */ #endif /* DNS_OPT_NEWCODES_LIVE */
authoritative = ISC_FALSE; authoritative = ISC_FALSE;
if (is_zone) { if (is_zone) {
/* /*