Commit cbf0854a authored by Automatic Updater's avatar Automatic Updater
Browse files

update copyright notice

parent 40696c4c
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: stats.h,v 1.14 2008/01/24 02:00:44 jinmei Exp $ */ /* $Id: stats.h,v 1.15 2008/01/24 23:47:00 tbox Exp $ */
#ifndef DNS_STATS_H #ifndef DNS_STATS_H
#define DNS_STATS_H 1 #define DNS_STATS_H 1
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium. * Copyright (C) 1998-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: types.h,v 1.127 2008/01/24 02:00:44 jinmei Exp $ */ /* $Id: types.h,v 1.128 2008/01/24 23:47:00 tbox Exp $ */
#ifndef DNS_TYPES_H #ifndef DNS_TYPES_H
#define DNS_TYPES_H 1 #define DNS_TYPES_H 1
...@@ -260,7 +260,7 @@ enum { ...@@ -260,7 +260,7 @@ enum {
dns_trust_additional = 2, dns_trust_additional = 2,
#define dns_trust_additional ((dns_trust_t)dns_trust_additional) #define dns_trust_additional ((dns_trust_t)dns_trust_additional)
/* Received in a referral response. */ /* Received in a referral response. */
dns_trust_glue = 3, dns_trust_glue = 3,
#define dns_trust_glue ((dns_trust_t)dns_trust_glue) #define dns_trust_glue ((dns_trust_t)dns_trust_glue)
...@@ -277,7 +277,7 @@ enum { ...@@ -277,7 +277,7 @@ enum {
dns_trust_authanswer = 6, dns_trust_authanswer = 6,
#define dns_trust_authanswer ((dns_trust_t)dns_trust_authanswer) #define dns_trust_authanswer ((dns_trust_t)dns_trust_authanswer)
/* Successfully DNSSEC validated */ /* Successfully DNSSEC validated */
dns_trust_secure = 7, dns_trust_secure = 7,
#define dns_trust_secure ((dns_trust_t)dns_trust_secure) #define dns_trust_secure ((dns_trust_t)dns_trust_secure)
...@@ -319,7 +319,7 @@ typedef void ...@@ -319,7 +319,7 @@ typedef void
typedef void typedef void
(*dns_updatecallback_t)(void *, isc_result_t, dns_message_t *); (*dns_updatecallback_t)(void *, isc_result_t, dns_message_t *);
typedef int typedef int
(*dns_rdatasetorderfunc_t)(const dns_rdata_t *, const void *); (*dns_rdatasetorderfunc_t)(const dns_rdata_t *, const void *);
typedef isc_boolean_t typedef isc_boolean_t
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.h,v 1.154 2008/01/24 02:00:44 jinmei Exp $ */ /* $Id: zone.h,v 1.155 2008/01/24 23:47:00 tbox Exp $ */
#ifndef DNS_ZONE_H #ifndef DNS_ZONE_H
#define DNS_ZONE_H 1 #define DNS_ZONE_H 1
...@@ -1194,7 +1194,7 @@ dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype); ...@@ -1194,7 +1194,7 @@ dns_zone_setnotifytype(dns_zone_t *zone, dns_notifytype_t notifytype);
isc_result_t isc_result_t
dns_zone_forwardupdate(dns_zone_t *zone, dns_message_t *msg, dns_zone_forwardupdate(dns_zone_t *zone, dns_message_t *msg,
dns_updatecallback_t callback, void *callback_arg); dns_updatecallback_t callback, void *callback_arg);
/*%< /*%<
* Forward 'msg' to each master in turn until we get an answer or we * Forward 'msg' to each master in turn until we get an answer or we
* have exausted the list of masters. 'callback' will be called with * have exausted the list of masters. 'callback' will be called with
...@@ -1400,7 +1400,7 @@ dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr); ...@@ -1400,7 +1400,7 @@ dns_zonemgr_getttransfersperns(dns_zonemgr_t *zmgr);
void void
dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit); dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit);
/*%< /*%<
* Set the number of simultaneous file descriptors available for * Set the number of simultaneous file descriptors available for
* reading and writing masterfiles. * reading and writing masterfiles.
* *
* Requires: * Requires:
...@@ -1411,7 +1411,7 @@ dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit); ...@@ -1411,7 +1411,7 @@ dns_zonemgr_setiolimit(dns_zonemgr_t *zmgr, isc_uint32_t iolimit);
isc_uint32_t isc_uint32_t
dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr); dns_zonemgr_getiolimit(dns_zonemgr_t *zmgr);
/*%< /*%<
* Get the number of simultaneous file descriptors available for * Get the number of simultaneous file descriptors available for
* reading and writing masterfiles. * reading and writing masterfiles.
* *
* Requires: * Requires:
...@@ -1539,7 +1539,7 @@ void ...@@ -1539,7 +1539,7 @@ void
dns_zone_name(dns_zone_t *zone, char *buf, size_t len); dns_zone_name(dns_zone_t *zone, char *buf, size_t len);
/*%< /*%<
* Return the name of the zone with class and view. * Return the name of the zone with class and view.
* *
* Requires: * Requires:
*\li 'zone' to be valid. *\li 'zone' to be valid.
*\li 'buf' to be non NULL. *\li 'buf' to be non NULL.
......
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium. * Copyright (C) 2000, 2001 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: stats.c,v 1.13 2008/01/24 02:00:44 jinmei Exp $ */ /* $Id: stats.c,v 1.14 2008/01/24 23:47:00 tbox Exp $ */
/*! \file */ /*! \file */
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.471 2008/01/24 02:00:44 jinmei Exp $ */ /* $Id: zone.c,v 1.472 2008/01/24 23:47:00 tbox Exp $ */
/*! \file */ /*! \file */
...@@ -355,7 +355,7 @@ struct dns_zonemgr { ...@@ -355,7 +355,7 @@ struct dns_zonemgr {
isc_uint32_t ioactive; isc_uint32_t ioactive;
dns_iolist_t high; dns_iolist_t high;
dns_iolist_t low; dns_iolist_t low;
/* Locked by rwlock. */ /* Locked by rwlock. */
/* LRU cache */ /* LRU cache */
struct dns_unreachable unreachable[UNREACH_CHACHE_SIZE]; struct dns_unreachable unreachable[UNREACH_CHACHE_SIZE];
...@@ -869,10 +869,10 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) { ...@@ -869,10 +869,10 @@ dns_zone_getdbtype(dns_zone_t *zone, char ***argv, isc_mem_t *mctx) {
isc_result_t result = ISC_R_SUCCESS; isc_result_t result = ISC_R_SUCCESS;
void *mem; void *mem;
char **tmp, *tmp2; char **tmp, *tmp2;
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE(argv != NULL && *argv == NULL); REQUIRE(argv != NULL && *argv == NULL);
LOCK_ZONE(zone); LOCK_ZONE(zone);
size = (zone->db_argc + 1) * sizeof(char *); size = (zone->db_argc + 1) * sizeof(char *);
for (i = 0; i < zone->db_argc; i++) for (i = 0; i < zone->db_argc; i++)
...@@ -1007,7 +1007,7 @@ void ...@@ -1007,7 +1007,7 @@ void
dns_zone_setacache(dns_zone_t *zone, dns_acache_t *acache) { dns_zone_setacache(dns_zone_t *zone, dns_acache_t *acache) {
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE(acache != NULL); REQUIRE(acache != NULL);
LOCK_ZONE(zone); LOCK_ZONE(zone);
if (zone->acache != NULL) if (zone->acache != NULL)
dns_acache_detach(&zone->acache); dns_acache_detach(&zone->acache);
...@@ -1501,7 +1501,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, ...@@ -1501,7 +1501,7 @@ zone_check_mx(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
dns_fixedname_t fixed; dns_fixedname_t fixed;
dns_name_t *foundname; dns_name_t *foundname;
int level; int level;
/* /*
* Outside of zone. * Outside of zone.
*/ */
...@@ -1583,7 +1583,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, ...@@ -1583,7 +1583,7 @@ zone_check_srv(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
dns_fixedname_t fixed; dns_fixedname_t fixed;
dns_name_t *foundname; dns_name_t *foundname;
int level; int level;
/* /*
* "." means the services does not exist. * "." means the services does not exist.
*/ */
...@@ -1674,7 +1674,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, ...@@ -1674,7 +1674,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
dns_rdataset_t a; dns_rdataset_t a;
dns_rdataset_t aaaa; dns_rdataset_t aaaa;
int level; int level;
/* /*
* Outside of zone. * Outside of zone.
*/ */
...@@ -1712,7 +1712,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name, ...@@ -1712,7 +1712,7 @@ zone_check_glue(dns_zone_t *zone, dns_db_t *db, dns_name_t *name,
if (tresult == ISC_R_SUCCESS) { if (tresult == ISC_R_SUCCESS) {
dns_rdataset_disassociate(&aaaa); dns_rdataset_disassociate(&aaaa);
return (ISC_TRUE); return (ISC_TRUE);
} }
if (tresult == DNS_R_DELEGATION) if (tresult == DNS_R_DELEGATION)
dns_rdataset_disassociate(&aaaa); dns_rdataset_disassociate(&aaaa);
if (result == DNS_R_GLUE || tresult == DNS_R_GLUE) { if (result == DNS_R_GLUE || tresult == DNS_R_GLUE) {
...@@ -1825,7 +1825,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) { ...@@ -1825,7 +1825,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
if (dns_name_equal(name, &zone->origin)) if (dns_name_equal(name, &zone->origin))
goto checkmx; goto checkmx;
result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_ns, result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_ns,
0, 0, &rdataset, NULL); 0, 0, &rdataset, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto checkmx; goto checkmx;
...@@ -1847,7 +1847,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) { ...@@ -1847,7 +1847,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
dns_rdataset_disassociate(&rdataset); dns_rdataset_disassociate(&rdataset);
checkmx: checkmx:
result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_mx, result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_mx,
0, 0, &rdataset, NULL); 0, 0, &rdataset, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto checksrv; goto checksrv;
...@@ -1866,7 +1866,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) { ...@@ -1866,7 +1866,7 @@ integrity_checks(dns_zone_t *zone, dns_db_t *db) {
checksrv: checksrv:
if (zone->rdclass != dns_rdataclass_in) if (zone->rdclass != dns_rdataclass_in)
goto next; goto next;
result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_srv, result = dns_db_findrdataset(db, node, NULL, dns_rdatatype_srv,
0, 0, &rdataset, NULL); 0, 0, &rdataset, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto next; goto next;
...@@ -1924,12 +1924,12 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) { ...@@ -1924,12 +1924,12 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) {
for (result = dns_rdataset_first(&rdataset); for (result = dns_rdataset_first(&rdataset);
result == ISC_R_SUCCESS; result == ISC_R_SUCCESS;
result = dns_rdataset_next(&rdataset)) result = dns_rdataset_next(&rdataset))
{ {
dns_rdataset_current(&rdataset, &rdata); dns_rdataset_current(&rdataset, &rdata);
result = dns_rdata_tostruct(&rdata, &dnskey, NULL); result = dns_rdata_tostruct(&rdata, &dnskey, NULL);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
if ((dnskey.algorithm == DST_ALG_RSASHA1 || if ((dnskey.algorithm == DST_ALG_RSASHA1 ||
dnskey.algorithm == DST_ALG_RSAMD5) && dnskey.algorithm == DST_ALG_RSAMD5) &&
dnskey.datalen > 1 && dnskey.data[0] == 1 && dnskey.datalen > 1 && dnskey.data[0] == 1 &&
...@@ -1961,7 +1961,7 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) { ...@@ -1961,7 +1961,7 @@ zone_check_dnskeys(dns_zone_t *zone, dns_db_t *db) {
dns_db_detachnode(db, &node); dns_db_detachnode(db, &node);
if (version != NULL) if (version != NULL)
dns_db_closeversion(db, &version, ISC_FALSE); dns_db_closeversion(db, &version, ISC_FALSE);
} }
static isc_result_t static isc_result_t
...@@ -2115,7 +2115,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime, ...@@ -2115,7 +2115,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
} else if (!isc_serial_ge(serial, zone->serial)) } else if (!isc_serial_ge(serial, zone->serial))
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"zone serial has gone backwards"); "zone serial has gone backwards");
else if (serial == zone->serial && !hasinclude) else if (serial == zone->serial && !hasinclude)
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"zone serial unchanged. " "zone serial unchanged. "
"zone may fail to transfer " "zone may fail to transfer "
...@@ -2247,7 +2247,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_name_t *name) { ...@@ -2247,7 +2247,7 @@ zone_check_ns(dns_zone_t *zone, dns_db_t *db, dns_name_t *name) {
dns_fixedname_t fixed; dns_fixedname_t fixed;
dns_name_t *foundname; dns_name_t *foundname;
int level; int level;
if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOCHECKNS)) if (DNS_ZONE_OPTION(zone, DNS_ZONEOPT_NOCHECKNS))
return (ISC_TRUE); return (ISC_TRUE);
...@@ -2836,7 +2836,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, ...@@ -2836,7 +2836,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
} }
LOCK_ZONE(zone); LOCK_ZONE(zone);
/* /*
* The refresh code assumes that 'masters' wouldn't change under it. * The refresh code assumes that 'masters' wouldn't change under it.
* If it will change then kill off any current refresh in progress * If it will change then kill off any current refresh in progress
* and update the masters info. If it won't change then we can just * and update the masters info. If it won't change then we can just
...@@ -2891,7 +2891,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone, ...@@ -2891,7 +2891,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
goto unlock; goto unlock;
} }
memcpy(new, masters, count * sizeof(*new)); memcpy(new, masters, count * sizeof(*new));
/* /*
* Similarly for mastersok. * Similarly for mastersok.
*/ */
...@@ -4240,7 +4240,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) { ...@@ -4240,7 +4240,7 @@ stub_callback(isc_task_t *task, isc_event_t *event) {
goto same_master; goto same_master;
} }
dns_zonemgr_unreachableadd(zone->zmgr, &zone->masteraddr, dns_zonemgr_unreachableadd(zone->zmgr, &zone->masteraddr,
&zone->sourceaddr, &now); &zone->sourceaddr, &now);
dns_zone_log(zone, ISC_LOG_INFO, dns_zone_log(zone, ISC_LOG_INFO,
"could not refresh stub from master %s" "could not refresh stub from master %s"
" (source %s): %s", master, source, " (source %s): %s", master, source,
...@@ -4515,7 +4515,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { ...@@ -4515,7 +4515,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
goto tcp_transfer; goto tcp_transfer;
} }
dns_zone_log(zone, ISC_LOG_DEBUG(1), dns_zone_log(zone, ISC_LOG_DEBUG(1),
"refresh: skipped tcp fallback" "refresh: skipped tcp fallback"
"as master %s (source %s) is " "as master %s (source %s) is "
"unreachable (cached)", "unreachable (cached)",
master, source); master, source);
...@@ -4699,7 +4699,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { ...@@ -4699,7 +4699,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
dns_zone_log(zone, ISC_LOG_INFO, dns_zone_log(zone, ISC_LOG_INFO,
"refresh: skipping %s as master %s " "refresh: skipping %s as master %s "
"(source %s) is unreachable (cached)", "(source %s) is unreachable (cached)",
zone->type == dns_zone_slave ? zone->type == dns_zone_slave ?
"zone transfer" : "NS query", "zone transfer" : "NS query",
master, source); master, source);
goto next_master; goto next_master;
...@@ -4935,7 +4935,7 @@ add_opt(dns_message_t *message, isc_uint16_t udpsize) { ...@@ -4935,7 +4935,7 @@ add_opt(dns_message_t *message, isc_uint16_t udpsize) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
dns_rdataset_init(rdataset); dns_rdataset_init(rdataset);
rdatalist->type = dns_rdatatype_opt; rdatalist->type = dns_rdatatype_opt;
rdatalist->covers = 0; rdatalist->covers = 0;
...@@ -4972,7 +4972,7 @@ add_opt(dns_message_t *message, isc_uint16_t udpsize) { ...@@ -4972,7 +4972,7 @@ add_opt(dns_message_t *message, isc_uint16_t udpsize) {
dns_message_puttemprdataset(message, &rdataset); dns_message_puttemprdataset(message, &rdataset);
if (rdata != NULL) if (rdata != NULL)
dns_message_puttemprdata(message, &rdata); dns_message_puttemprdata(message, &rdata);
return (result); return (result);
} }
...@@ -5262,7 +5262,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) { ...@@ -5262,7 +5262,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
} }
} }
if (key == NULL) if (key == NULL)
(void)dns_view_getpeertsig(zone->view, &masterip, &key); (void)dns_view_getpeertsig(zone->view, &masterip, &key);
if (zone->view->peers != NULL) { if (zone->view->peers != NULL) {
dns_peer_t *peer = NULL; dns_peer_t *peer = NULL;
...@@ -5282,7 +5282,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) { ...@@ -5282,7 +5282,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
dns_resolver_getudpsize(zone->view->resolver); dns_resolver_getudpsize(zone->view->resolver);
(void)dns_peer_getudpsize(peer, &udpsize); (void)dns_peer_getudpsize(peer, &udpsize);
} }
} }
if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) { if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOEDNS)) {
result = add_opt(message, udpsize); result = add_opt(message, udpsize);
...@@ -5416,7 +5416,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) { ...@@ -5416,7 +5416,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
if (zone->writeio != NULL) if (zone->writeio != NULL)
zonemgr_cancelio(zone->writeio); zonemgr_cancelio(zone->writeio);
if (zone->dctx != NULL) if (zone->dctx != NULL)
dns_dumpctx_cancel(zone->dctx); dns_dumpctx_cancel(zone->dctx);
} }
...@@ -6846,7 +6846,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) { ...@@ -6846,7 +6846,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
} }
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDCOMPACT); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NEEDCOMPACT);
} }
/* /*
* This transfer finishing freed up a transfer quota slot. * This transfer finishing freed up a transfer quota slot.
* Let any other zones waiting for quota have it. * Let any other zones waiting for quota have it.
...@@ -6884,7 +6884,7 @@ zone_loaddone(void *arg, isc_result_t result) { ...@@ -6884,7 +6884,7 @@ zone_loaddone(void *arg, isc_result_t result) {
ENTER; ENTER;
tresult = dns_db_endload(load->db, &load->callbacks.add_private); tresult = dns_db_endload(load->db, &load->callbacks.add_private);
if (tresult != ISC_R_SUCCESS && if (tresult != ISC_R_SUCCESS &&
(result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE)) (result == ISC_R_SUCCESS || result == DNS_R_SEENINCLUDE))
result = tresult; result = tresult;
......
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium. * Copyright (C) 1999-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and/or distribute this software for any
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: platform.h.in,v 1.46 2008/01/24 02:00:44 jinmei Exp $ */ /* $Id: platform.h.in,v 1.47 2008/01/24 23:47:00 tbox Exp $ */
#ifndef ISC_PLATFORM_H #ifndef ISC_PLATFORM_H
#define ISC_PLATFORM_H 1 #define ISC_PLATFORM_H 1
...@@ -108,13 +108,13 @@ ...@@ -108,13 +108,13 @@
* for IPv6. * for IPv6.
*/ */
@ISC_PLATFORM_HAVELIFCONF@ @ISC_PLATFORM_HAVELIFCONF@
/*! \brief /*! \brief
* Define if the system has struct if_laddrconf which is a extended struct * Define if the system has struct if_laddrconf which is a extended struct
* ifconf for IPv6. * ifconf for IPv6.
*/ */
@ISC_PLATFORM_HAVEIF_LADDRCONF@ @ISC_PLATFORM_HAVEIF_LADDRCONF@
/*! \brief /*! \brief
* Define if the system has struct if_laddrreq. * Define if the system has struct if_laddrreq.
*/ */
...@@ -168,17 +168,17 @@ ...@@ -168,17 +168,17 @@
* If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined. * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined.
*/ */
@ISC_PLATFORM_NEEDSTRLCPY@ @ISC_PLATFORM_NEEDSTRLCPY@
/* /*
* If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined. * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined.
*/ */
@ISC_PLATFORM_NEEDSTRLCAT@ @ISC_PLATFORM_NEEDSTRLCAT@
/* /*
* Define if this system needs strtoul. * Define if this system needs strtoul.
*/ */
@ISC_PLATFORM_NEEDSTRTOUL@ @ISC_PLATFORM_NEEDSTRTOUL@