Commit fcb54ce0 authored by Mark Andrews's avatar Mark Andrews

whitespace / layout

parent bb030ee8
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.21 2002/12/27 03:29:29 marka Exp $ # $Id: Makefile.in,v 1.22 2003/10/17 03:46:41 marka Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
...@@ -65,9 +65,10 @@ named-checkzone.@O@: named-checkzone.c ...@@ -65,9 +65,10 @@ named-checkzone.@O@: named-checkzone.c
${LIBTOOL} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \ ${LIBTOOL} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-c ${srcdir}/named-checkzone.c -c ${srcdir}/named-checkzone.c
named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS} named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} \
${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkconf.@O@ \ ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkconf.@O@ \
check-tool.@O@ ${BIND9LIBS} ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} ${LIBS} check-tool.@O@ ${BIND9LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkzone.@O@ \ ${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkzone.@O@ \
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named-checkzone.c,v 1.25 2002/10/25 01:02:53 marka Exp $ */ /* $Id: named-checkzone.c,v 1.26 2003/10/17 03:46:41 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -112,7 +112,7 @@ main(int argc, char **argv) { ...@@ -112,7 +112,7 @@ main(int argc, char **argv) {
quiet++; quiet++;
break; break;
case 't': case 't':
result = isc_dir_chroot(isc_commandline_argument); result = isc_dir_chroot(isc_commandline_argument);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
fprintf(stderr, "isc_dir_chroot: %s: %s\n", fprintf(stderr, "isc_dir_chroot: %s: %s\n",
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rndc-confgen.c,v 1.16 2003/03/03 05:08:56 marka Exp $ */ /* $Id: rndc-confgen.c,v 1.17 2003/10/17 03:46:42 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -101,7 +101,7 @@ write_key_file(const char *keyfile, const char *user, ...@@ -101,7 +101,7 @@ write_key_file(const char *keyfile, const char *user,
(int)isc_buffer_usedlength(secret), (int)isc_buffer_usedlength(secret),
(char *)isc_buffer_base(secret)); (char *)isc_buffer_base(secret));
fflush(fd); fflush(fd);
if (ferror(fd)) if (ferror(fd))
fatal("write to %s failed\n", keyfile); fatal("write to %s failed\n", keyfile);
if (fclose(fd)) if (fclose(fd))
fatal("fclose(%s) failed\n", keyfile); fatal("fclose(%s) failed\n", keyfile);
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
3090: DNS Security Extension Clarification on Zone Status 3090: DNS Security Extension Clarification on Zone Status
3110: RSA/SHA-1 SIGs and RSA KEYs in the Domain Name System (DNS) 3110: RSA/SHA-1 SIGs and RSA KEYs in the Domain Name System (DNS)
3123: A DNS RR Type for Lists of Address Prefixes (APL RR) 3123: A DNS RR Type for Lists of Address Prefixes (APL RR)
3152: Delegation of IP6.ARPA
3225: Indicating Resolver Support of DNSSEC 3225: Indicating Resolver Support of DNSSEC
3226: DNSSEC and IPv6 A6 aware server/resolver message size requirements 3226: DNSSEC and IPv6 A6 aware server/resolver message size requirements
3258: Distributing Authoritative Name Servers via Shared Unicast Addresses 3258: Distributing Authoritative Name Servers via Shared Unicast Addresses
......
/* /*
* Copyright (C) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: adb.c,v 1.209 2003/10/16 05:46:19 marka Exp $ */ /* $Id: adb.c,v 1.210 2003/10/17 03:46:43 marka Exp $ */
/* /*
* Implementation notes * Implementation notes
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
* *
* XXXRTH How many buckets do we need? * XXXRTH How many buckets do we need?
*/ */
#define NBUCKETS 1009 /* how many buckets for names/addrs */ #define NBUCKETS 1009 /* how many buckets for names/addrs */
/* /*
* For type 3 negative cache entries, we will remember that the address is * For type 3 negative cache entries, we will remember that the address is
...@@ -1844,6 +1844,7 @@ check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now) ...@@ -1844,6 +1844,7 @@ check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now)
if (entry->expires == 0 || (! expire && entry->expires > now)) if (entry->expires == 0 || (! expire && entry->expires > now))
return (result); return (result);
/* /*
* The entry is not in use. Delete it. * The entry is not in use. Delete it.
*/ */
...@@ -2505,7 +2506,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, ...@@ -2505,7 +2506,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action,
dns_rdatatype_aaaa) == ISC_R_SUCCESS) { dns_rdatatype_aaaa) == ISC_R_SUCCESS) {
DP(DEF_LEVEL, DP(DEF_LEVEL,
"dns_adb_createfind: " "dns_adb_createfind: "
"started AAAA fetch for name %p", "started AAAA fetch for name %p",
adbname); adbname);
} }
} }
...@@ -3266,7 +3267,8 @@ fetch_name(dns_adbname_t *adbname, ...@@ -3266,7 +3267,8 @@ fetch_name(dns_adbname_t *adbname,
options = 0; options = 0;
if (start_at_zone) { if (start_at_zone) {
DP(50, "fetch_name: starting at zone for %p", DP(ENTER_LEVEL,
"fetch_name: starting at zone for name %p",
adbname); adbname);
dns_fixedname_init(&fixed); dns_fixedname_init(&fixed);
name = dns_fixedname_name(&fixed); name = dns_fixedname_name(&fixed);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: adb.h,v 1.74 2003/07/25 02:22:25 marka Exp $ */ /* $Id: adb.h,v 1.75 2003/10/17 03:46:45 marka Exp $ */
#ifndef DNS_ADB_H #ifndef DNS_ADB_H
#define DNS_ADB_H 1 #define DNS_ADB_H 1
...@@ -253,7 +253,7 @@ dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbp); ...@@ -253,7 +253,7 @@ dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbp);
* Requires: * Requires:
* 'adb' to be a valid dns_adb_t, created via dns_adb_create(). * 'adb' to be a valid dns_adb_t, created via dns_adb_create().
* 'adbp' to be a valid pointer to a *dns_adb_t which is initialized * 'adbp' to be a valid pointer to a *dns_adb_t which is initialized
* to NULL. * to NULL.
*/ */
void void
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: byaddr.h,v 1.14 2002/08/27 04:53:43 marka Exp $ */ /* $Id: byaddr.h,v 1.15 2003/10/17 03:46:45 marka Exp $ */
#ifndef DNS_BYADDR_H #ifndef DNS_BYADDR_H
#define DNS_BYADDR_H 1 #define DNS_BYADDR_H 1
...@@ -150,7 +150,7 @@ dns_byaddr_createptrname(isc_netaddr_t *address, isc_boolean_t nibble, ...@@ -150,7 +150,7 @@ dns_byaddr_createptrname(isc_netaddr_t *address, isc_boolean_t nibble,
isc_result_t isc_result_t
dns_byaddr_createptrname2(isc_netaddr_t *address, unsigned int options, dns_byaddr_createptrname2(isc_netaddr_t *address, unsigned int options,
dns_name_t *name); dns_name_t *name);
/* /*
* Creates a name that would be used in a PTR query for this address. The * Creates a name that would be used in a PTR query for this address. The
* nibble flag indicates that the 'nibble' format is to be used if an IPv6 * nibble flag indicates that the 'nibble' format is to be used if an IPv6
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdata.h,v 1.57 2003/09/30 05:56:17 marka Exp $ */ /* $Id: rdata.h,v 1.58 2003/10/17 03:46:45 marka Exp $ */
#ifndef DNS_RDATA_H #ifndef DNS_RDATA_H
#define DNS_RDATA_H 1 #define DNS_RDATA_H 1
...@@ -161,7 +161,7 @@ dns_rdata_reset(dns_rdata_t *rdata); ...@@ -161,7 +161,7 @@ dns_rdata_reset(dns_rdata_t *rdata);
* Make 'rdata' empty. * Make 'rdata' empty.
* *
* Requires: * Requires:
* 'rdata' is a previously initaliased rdata and is not linked. * 'rdata' is a previously initialized rdata and is not linked.
*/ */
void void
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: masterdump.c,v 1.69 2003/09/30 05:56:12 marka Exp $ */ /* $Id: masterdump.c,v 1.70 2003/10/17 03:46:43 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -894,10 +894,10 @@ void ...@@ -894,10 +894,10 @@ void
dns_dumpctx_detach(dns_dumpctx_t **dctxp) { dns_dumpctx_detach(dns_dumpctx_t **dctxp) {
dns_dumpctx_t *dctx; dns_dumpctx_t *dctx;
isc_boolean_t need_destroy = ISC_FALSE; isc_boolean_t need_destroy = ISC_FALSE;
REQUIRE(dctxp != NULL); REQUIRE(dctxp != NULL);
dctx = *dctxp; dctx = *dctxp;
REQUIRE(DNS_DCTX_VALID(dctx)); REQUIRE(DNS_DCTX_VALID(dctx));
*dctxp = NULL; *dctxp = NULL;
...@@ -925,11 +925,11 @@ dns_dumpctx_db(dns_dumpctx_t *dctx) { ...@@ -925,11 +925,11 @@ dns_dumpctx_db(dns_dumpctx_t *dctx) {
void void
dns_dumpctx_cancel(dns_dumpctx_t *dctx) { dns_dumpctx_cancel(dns_dumpctx_t *dctx) {
REQUIRE(DNS_DCTX_VALID(dctx)); REQUIRE(DNS_DCTX_VALID(dctx));
LOCK(&dctx->lock); LOCK(&dctx->lock);
dctx->canceled = ISC_TRUE; dctx->canceled = ISC_TRUE;
UNLOCK(&dctx->lock); UNLOCK(&dctx->lock);
} }
static isc_result_t static isc_result_t
...@@ -1002,8 +1002,8 @@ static isc_result_t ...@@ -1002,8 +1002,8 @@ static isc_result_t
task_send(dns_dumpctx_t *dctx) { task_send(dns_dumpctx_t *dctx) {
isc_event_t *event; isc_event_t *event;
event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_DUMPQUANTUM, event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_MASTERQUANTUM,
dump_quantum, dctx, sizeof(*event)); dump_quantum, dctx, sizeof(*event));
if (event == NULL) if (event == NULL)
return (ISC_R_NOMEMORY); return (ISC_R_NOMEMORY);
isc_task_send(dctx->task, &event); isc_task_send(dctx->task, &event);
...@@ -1035,7 +1035,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, ...@@ -1035,7 +1035,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
dctx->canceled = ISC_FALSE; dctx->canceled = ISC_FALSE;
dctx->file = NULL; dctx->file = NULL;
dctx->tmpfile = NULL; dctx->tmpfile = NULL;
result = totext_ctx_init(style, &dctx->tctx); result = totext_ctx_init(style, &dctx->tctx);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
...@@ -1049,7 +1049,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, ...@@ -1049,7 +1049,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
dctx->do_date = dns_db_iscache(dctx->db); dctx->do_date = dns_db_iscache(dctx->db);
relative = ((dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) ? relative = ((dctx->tctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) ?
ISC_TRUE : ISC_FALSE, ISC_TRUE : ISC_FALSE;
result = dns_db_createiterator(dctx->db, relative, &dctx->dbiter); result = dns_db_createiterator(dctx->db, relative, &dctx->dbiter);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
...@@ -1067,7 +1067,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version, ...@@ -1067,7 +1067,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
*dctxp = dctx; *dctxp = dctx;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup: cleanup:
if (dctx->dbiter != NULL) if (dctx->dbiter != NULL)
dns_dbiterator_destroy(&dctx->dbiter); dns_dbiterator_destroy(&dctx->dbiter);
if (dctx->db != NULL) if (dctx->db != NULL)
...@@ -1115,7 +1115,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) { ...@@ -1115,7 +1115,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
dctx->first = ISC_FALSE; dctx->first = ISC_FALSE;
} else } else
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
nodes = dctx->nodes; nodes = dctx->nodes;
while (result == ISC_R_SUCCESS && (dctx->nodes == 0 || nodes--)) { while (result == ISC_R_SUCCESS && (dctx->nodes == 0 || nodes--)) {
dns_rdatasetiter_t *rdsiter = NULL; dns_rdatasetiter_t *rdsiter = NULL;
...@@ -1155,7 +1155,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) { ...@@ -1155,7 +1155,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
result = DNS_R_CONTINUE; result = DNS_R_CONTINUE;
} else if (result == ISC_R_NOMORE) } else if (result == ISC_R_NOMORE)
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
fail: fail:
isc_mem_put(dctx->mctx, buffer.base, buffer.length); isc_mem_put(dctx->mctx, buffer.base, buffer.length);
return (result); return (result);
} }
...@@ -1170,7 +1170,7 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db, ...@@ -1170,7 +1170,7 @@ dns_master_dumptostreaminc(isc_mem_t *mctx, dns_db_t *db,
{ {
dns_dumpctx_t *dctx = NULL; dns_dumpctx_t *dctx = NULL;
isc_result_t result; isc_result_t result;
REQUIRE(task != NULL); REQUIRE(task != NULL);
REQUIRE(f != NULL); REQUIRE(f != NULL);
REQUIRE(done != NULL); REQUIRE(done != NULL);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: name.c,v 1.140 2003/07/25 02:22:24 marka Exp $ */ /* $Id: name.c,v 1.141 2003/10/17 03:46:43 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -1250,7 +1250,7 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot, ...@@ -1250,7 +1250,7 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
} }
count--; count--;
} }
} else { } else {
FATAL_ERROR(__FILE__, __LINE__, FATAL_ERROR(__FILE__, __LINE__,
"Unexpected label type %02x", count); "Unexpected label type %02x", count);
/* NOTREACHED */ /* NOTREACHED */
......
/* /*
* Copyright (C) 1998-2002 Internet Software Consortium. * Copyright (C) 1998-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdata.c,v 1.180 2003/09/30 05:56:12 marka Exp $ */ /* $Id: rdata.c,v 1.181 2003/10/17 03:46:43 marka Exp $ */
#include <config.h> #include <config.h>
#include <ctype.h> #include <ctype.h>
...@@ -990,7 +990,7 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source, ...@@ -990,7 +990,7 @@ maybe_numeric(unsigned int *valuep, isc_textregion_t *source,
*/ */
strncpy(buffer, source->base, NUMBERSIZE); strncpy(buffer, source->base, NUMBERSIZE);
INSIST(buffer[source->length] == '\0'); INSIST(buffer[source->length] == '\0');
result = isc_parse_uint32(&n, buffer, 10); result = isc_parse_uint32(&n, buffer, 10);
if (result == ISC_R_BADNUMBER && hex_allowed) if (result == ISC_R_BADNUMBER && hex_allowed)
result = isc_parse_uint32(&n, buffer, 16); result = isc_parse_uint32(&n, buffer, 16);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: resolver.c,v 1.269 2003/09/30 05:56:13 marka Exp $ */ /* $Id: resolver.c,v 1.270 2003/10/17 03:46:44 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -548,7 +548,7 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp, ...@@ -548,7 +548,7 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
if (UNMARKED(addrinfo)) if (UNMARKED(addrinfo))
dns_adb_adjustsrtt(fctx->adb, addrinfo, dns_adb_adjustsrtt(fctx->adb, addrinfo,
0, factor); 0, factor);
for (find = ISC_LIST_HEAD(fctx->altfinds); for (find = ISC_LIST_HEAD(fctx->altfinds);
find != NULL; find != NULL;
find = ISC_LIST_NEXT(find, publink)) find = ISC_LIST_NEXT(find, publink))
for (addrinfo = ISC_LIST_HEAD(find->list); for (addrinfo = ISC_LIST_HEAD(find->list);
...@@ -1737,8 +1737,7 @@ findname(fetchctx_t *fctx, dns_name_t *name, in_port_t port, ...@@ -1737,8 +1737,7 @@ findname(fetchctx_t *fctx, dns_name_t *name, in_port_t port,
* And ADB isn't going to send us any events * And ADB isn't going to send us any events
* either. This find loses. * either. This find loses.
*/ */
if ((find->options & DNS_ADBFIND_LAMEPRUNED) if ((find->options & DNS_ADBFIND_LAMEPRUNED) != 0) {
!= 0) {
/* /*
* The ADB pruned lame servers for * The ADB pruned lame servers for
* this name. Remember that in case * this name. Remember that in case
...@@ -1803,7 +1802,7 @@ fctx_getaddresses(fetchctx_t *fctx) { ...@@ -1803,7 +1802,7 @@ fctx_getaddresses(fetchctx_t *fctx) {
fctx->fwdpolicy = forwarders->fwdpolicy; fctx->fwdpolicy = forwarders->fwdpolicy;
} }
} }
while (sa != NULL) { while (sa != NULL) {
ai = NULL; ai = NULL;
result = dns_adb_findaddrinfo(fctx->adb, result = dns_adb_findaddrinfo(fctx->adb,
...@@ -2147,7 +2146,7 @@ fctx_nextaddress(fetchctx_t *fctx) { ...@@ -2147,7 +2146,7 @@ fctx_nextaddress(fetchctx_t *fctx) {
if (!UNMARKED(addrinfo)) if (!UNMARKED(addrinfo))
continue; continue;
possibly_mark(fctx, addrinfo); possibly_mark(fctx, addrinfo);
if (UNMARKED(addrinfo) && if (UNMARKED(addrinfo) &&
(faddrinfo == NULL || (faddrinfo == NULL ||
addrinfo->srtt < faddrinfo->srtt)) { addrinfo->srtt < faddrinfo->srtt)) {
if (faddrinfo != NULL) if (faddrinfo != NULL)
...@@ -4995,11 +4994,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) { ...@@ -4995,11 +4994,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
/* /*
* Enforce delegations only zones like NET and COM. * Enforce delegations only zones like NET and COM.
*/ */
oldcounts[DNS_SECTION_QUESTION] = message->counts[DNS_SECTION_QUESTION];
oldcounts[DNS_SECTION_ANSWER] = message->counts[DNS_SECTION_ANSWER];
oldcounts[DNS_SECTION_AUTHORITY] = message->counts[DNS_SECTION_AUTHORITY];
oldcounts[DNS_SECTION_ADDITIONAL] = message->counts[DNS_SECTION_ADDITIONAL];
if (!ISFORWARDER(query->addrinfo) && if (!ISFORWARDER(query->addrinfo) &&
dns_view_isdelegationonly(fctx->res->view, &fctx->domain) && dns_view_isdelegationonly(fctx->res->view, &fctx->domain) &&
!dns_name_equal(&fctx->domain, &fctx->name) && !dns_name_equal(&fctx->domain, &fctx->name) &&
...@@ -5021,14 +5015,8 @@ oldcounts[DNS_SECTION_ADDITIONAL] = message->counts[DNS_SECTION_ADDITIONAL]; ...@@ -5021,14 +5015,8 @@ oldcounts[DNS_SECTION_ADDITIONAL] = message->counts[DNS_SECTION_ADDITIONAL];
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DELEGATION_ONLY, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DELEGATION_ONLY,
DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE, DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE,
"enforced delegation-only for '%s' (%s/%s/%s) " "enforced delegation-only for '%s' (%s/%s/%s) "
"flags=%04x counts(%u,%u,%u,%u) from %s", "from %s",
domainbuf, namebuf, typebuf, classbuf, domainbuf, namebuf, typebuf, classbuf, addrbuf);
message->flags,
oldcounts[DNS_SECTION_QUESTION],
oldcounts[DNS_SECTION_ANSWER],
oldcounts[DNS_SECTION_AUTHORITY],
oldcounts[DNS_SECTION_ADDITIONAL],
addrbuf);
} }
/* /*
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: result.c,v 1.109 2003/09/30 05:56:13 marka Exp $ */ /* $Id: result.c,v 1.110 2003/10/17 03:46:44 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -131,7 +131,7 @@ static const char *text[DNS_R_NRESULTS] = { ...@@ -131,7 +131,7 @@ static const char *text[DNS_R_NRESULTS] = {
"unknown flag", /* 82 DNS_R_UNKNOWNFLAG */ "unknown flag", /* 82 DNS_R_UNKNOWNFLAG */
"expected a response", /* 83 DNS_R_EXPECTEDRESPONSE */ "expected a response", /* 83 DNS_R_EXPECTEDRESPONSE */
"no valid DS", /* 84 DNS_R_NOVALIDDS */ "no valid DS", /* 84 DNS_R_NOVALIDDS */
"NS is an address", /* 85 DNS_R_NSISADDRESS */ "NS is an address", /* 85 DNS_R_NSISADDRESS */
"received FORMERR", /* 86 DNS_R_REMOTEFORMERR */ "received FORMERR", /* 86 DNS_R_REMOTEFORMERR */
"truncated TCP response", /* 87 DNS_R_TRUNCATEDTCP */ "truncated TCP response", /* 87 DNS_R_TRUNCATEDTCP */
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.399 2003/09/25 18:16:47 jinmei Exp $ */ /* $Id: zone.c,v 1.400 2003/10/17 03:46:44 marka Exp $ */
#include <config.h> #include <config.h>
...@@ -139,7 +139,7 @@ struct dns_zone { ...@@ -139,7 +139,7 @@ struct dns_zone {
isc_timer_t *timer; isc_timer_t *timer;
unsigned int irefs; unsigned int irefs;
dns_name_t origin; dns_name_t origin;
char *masterfile; char *masterfile;
char *journal; char *journal;
isc_int32_t journalsize;