upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 11:32:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.
*/
/* $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) {
/*