# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# 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@
VPATH = @srcdir@
${LIBTOOL} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
-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@ \
- 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}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkzone.@O@ \
* 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>
quiet++;
break;
- case 't':
+ case 't':
result = isc_dir_chroot(isc_commandline_argument);
if (result != ISC_R_SUCCESS) {
fprintf(stderr, "isc_dir_chroot: %s: %s\n",
* 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>
(int)isc_buffer_usedlength(secret),
(char *)isc_buffer_base(secret));
fflush(fd);
- if (ferror(fd))
+ if (ferror(fd))
fatal("write to %s failed\n", keyfile);
if (fclose(fd))
fatal("fclose(%s) failed\n", keyfile);
3090: DNS Security Extension Clarification on Zone Status
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)
+3152: Delegation of IP6.ARPA
3225: Indicating Resolver Support of DNSSEC
3226: DNSSEC and IPv6 A6 aware server/resolver message size requirements
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
* purpose with or without fee is hereby granted, provided that the above
* 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
*
* 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
if (entry->expires == 0 || (! expire && entry->expires > now))
return (result);
+
/*
* The entry is not in use. Delete it.
*/
dns_rdatatype_aaaa) == ISC_R_SUCCESS) {
DP(DEF_LEVEL,
"dns_adb_createfind: "
- "started AAAA fetch for name %p",
+ "started AAAA fetch for name %p",
adbname);
}
}
options = 0;
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);
dns_fixedname_init(&fixed);
name = dns_fixedname_name(&fixed);
* 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
#define DNS_ADB_H 1
* Requires:
* '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
- * to NULL.
+ * to NULL.
*/
void
* 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
#define DNS_BYADDR_H 1
isc_result_t
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
* nibble flag indicates that the 'nibble' format is to be used if an IPv6
* 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
#define DNS_RDATA_H 1
* Make 'rdata' empty.
*
* Requires:
- * 'rdata' is a previously initaliased rdata and is not linked.
+ * 'rdata' is a previously initialized rdata and is not linked.
*/
void
* 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>
dns_dumpctx_detach(dns_dumpctx_t **dctxp) {
dns_dumpctx_t *dctx;
isc_boolean_t need_destroy = ISC_FALSE;
-
+
REQUIRE(dctxp != NULL);
dctx = *dctxp;
- REQUIRE(DNS_DCTX_VALID(dctx));
+ REQUIRE(DNS_DCTX_VALID(dctx));
*dctxp = NULL;
void
dns_dumpctx_cancel(dns_dumpctx_t *dctx) {
- REQUIRE(DNS_DCTX_VALID(dctx));
-
- LOCK(&dctx->lock);
- dctx->canceled = ISC_TRUE;
- UNLOCK(&dctx->lock);
+ REQUIRE(DNS_DCTX_VALID(dctx));
+
+ LOCK(&dctx->lock);
+ dctx->canceled = ISC_TRUE;
+ UNLOCK(&dctx->lock);
}
static isc_result_t
task_send(dns_dumpctx_t *dctx) {
isc_event_t *event;
- event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_DUMPQUANTUM,
- dump_quantum, dctx, sizeof(*event));
+ event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_MASTERQUANTUM,
+ dump_quantum, dctx, sizeof(*event));
if (event == NULL)
return (ISC_R_NOMEMORY);
isc_task_send(dctx->task, &event);
dctx->canceled = ISC_FALSE;
dctx->file = NULL;
dctx->tmpfile = NULL;
-
+
result = totext_ctx_init(style, &dctx->tctx);
if (result != ISC_R_SUCCESS) {
UNEXPECTED_ERROR(__FILE__, __LINE__,
dctx->do_date = dns_db_iscache(dctx->db);
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);
if (result != ISC_R_SUCCESS)
goto cleanup;
*dctxp = dctx;
return (ISC_R_SUCCESS);
-cleanup:
+ cleanup:
if (dctx->dbiter != NULL)
dns_dbiterator_destroy(&dctx->dbiter);
if (dctx->db != NULL)
dctx->first = ISC_FALSE;
} else
result = ISC_R_SUCCESS;
-
+
nodes = dctx->nodes;
while (result == ISC_R_SUCCESS && (dctx->nodes == 0 || nodes--)) {
dns_rdatasetiter_t *rdsiter = NULL;
result = DNS_R_CONTINUE;
} else if (result == ISC_R_NOMORE)
result = ISC_R_SUCCESS;
- fail:
+ fail:
isc_mem_put(dctx->mctx, buffer.base, buffer.length);
return (result);
}
{
dns_dumpctx_t *dctx = NULL;
isc_result_t result;
-
+
REQUIRE(task != NULL);
REQUIRE(f != NULL);
REQUIRE(done != NULL);
* 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>
}
count--;
}
- } else {
+ } else {
FATAL_ERROR(__FILE__, __LINE__,
"Unexpected label type %02x", count);
/* 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
* purpose with or without fee is hereby granted, provided that the above
* 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 <ctype.h>
*/
strncpy(buffer, source->base, NUMBERSIZE);
INSIST(buffer[source->length] == '\0');
-
+
result = isc_parse_uint32(&n, buffer, 10);
if (result == ISC_R_BADNUMBER && hex_allowed)
result = isc_parse_uint32(&n, buffer, 16);
* 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>
if (UNMARKED(addrinfo))
dns_adb_adjustsrtt(fctx->adb, addrinfo,
0, factor);
- for (find = ISC_LIST_HEAD(fctx->altfinds);
+ for (find = ISC_LIST_HEAD(fctx->altfinds);
find != NULL;
find = ISC_LIST_NEXT(find, publink))
for (addrinfo = ISC_LIST_HEAD(find->list);
* And ADB isn't going to send us any events
* either. This find loses.
*/
- if ((find->options & DNS_ADBFIND_LAMEPRUNED)
- != 0) {
+ if ((find->options & DNS_ADBFIND_LAMEPRUNED) != 0) {
/*
* The ADB pruned lame servers for
* this name. Remember that in case
fctx->fwdpolicy = forwarders->fwdpolicy;
}
}
-
+
while (sa != NULL) {
ai = NULL;
result = dns_adb_findaddrinfo(fctx->adb,
if (!UNMARKED(addrinfo))
continue;
possibly_mark(fctx, addrinfo);
- if (UNMARKED(addrinfo) &&
+ if (UNMARKED(addrinfo) &&
(faddrinfo == NULL ||
addrinfo->srtt < faddrinfo->srtt)) {
if (faddrinfo != NULL)
/*
* 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) &&
dns_view_isdelegationonly(fctx->res->view, &fctx->domain) &&
!dns_name_equal(&fctx->domain, &fctx->name) &&
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DELEGATION_ONLY,
DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE,
"enforced delegation-only for '%s' (%s/%s/%s) "
- "flags=%04x counts(%u,%u,%u,%u) from %s",
- domainbuf, namebuf, typebuf, classbuf,
- message->flags,
- oldcounts[DNS_SECTION_QUESTION],
- oldcounts[DNS_SECTION_ANSWER],
- oldcounts[DNS_SECTION_AUTHORITY],
- oldcounts[DNS_SECTION_ADDITIONAL],
- addrbuf);
+ "from %s",
+ domainbuf, namebuf, typebuf, classbuf, addrbuf);
}
/*
* 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>
"unknown flag", /* 82 DNS_R_UNKNOWNFLAG */
"expected a response", /* 83 DNS_R_EXPECTEDRESPONSE */
"no valid DS", /* 84 DNS_R_NOVALIDDS */
-
+
"NS is an address", /* 85 DNS_R_NSISADDRESS */
"received FORMERR", /* 86 DNS_R_REMOTEFORMERR */
"truncated TCP response", /* 87 DNS_R_TRUNCATEDTCP */
* 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>
isc_timer_t *timer;
unsigned int irefs;
dns_name_t origin;
- char *masterfile;
+ char *masterfile;
char *journal;
isc_int32_t journalsize;
dns_rdataclass_t rdclass;
struct dns_zonemgr {
unsigned int magic;
isc_mem_t * mctx;
- int refs; /* Locked by rwlock */
+ int refs; /* Locked by rwlock */
isc_taskmgr_t * taskmgr;
isc_timermgr_t * timermgr;
isc_socketmgr_t * socketmgr;
isc_uint32_t which;
isc_sockaddr_t addr;
dns_updatecallback_t callback;
- void *callback_arg;
+ void *callback_arg;
};
/*
result = dns_zone_setdbtype(zone, dbargc_default, dbargv_default);
if (result != ISC_R_SUCCESS)
goto free_mutex;
-
+
ISC_EVENT_INIT(&zone->ctlevent, sizeof(zone->ctlevent), 0, NULL,
DNS_EVENT_ZONECONTROL, zone_shutdown, zone, zone,
NULL, NULL);
zone->db_argv = new;
result = ISC_R_SUCCESS;
goto unlock;
-
+
nomem:
if (new != NULL) {
for (i = 0; i < dbargc; i++) {
if (zone->db_argv[i] != NULL)
isc_mem_free(zone->mctx, new[i]);
- isc_mem_put(zone->mctx, new,
+ isc_mem_put(zone->mctx, new,
dbargc * sizeof(*new));
}
}
result = ISC_R_NOMEMORY;
-
+
unlock:
UNLOCK_ZONE(zone);
return (result);
return (result);
}
-
+
static isc_result_t
dns_zone_setstring(dns_zone_t *zone, char **field, const char *value) {
char *copy;
*field = copy;
return (ISC_R_SUCCESS);
-}
+}
isc_result_t
dns_zone_setfile(dns_zone_t *zone, const char *file) {
REQUIRE(DNS_ZONE_VALID(zone));
LOCK_ZONE(zone);
- result = dns_zone_setstring(zone, &zone->journal, journal);
+ result = dns_zone_setstring(zone, &zone->journal, journal);
UNLOCK_ZONE(zone);
return (result);
zone->type == dns_zone_stub ||
(!zone->update_disabled && zone->ssutable != NULL) ||
(!zone->update_disabled && zone->update_acl != NULL &&
- ! (zone->update_acl->length == 1 &&
+ ! (zone->update_acl->length == 1 &&
zone->update_acl->elements[0].negative == ISC_TRUE
&&
zone->update_acl->elements[0].type ==
result = ISC_R_SUCCESS;
goto cleanup;
}
-
+
/*
* Don't do the load if the file that stores the zone is older
* than the last time the zone was loaded. If the zone has not
goto cleanup;
}
}
- }
+ }
INSIST(zone->db_argc >= 1);
&load->callbacks.add_private);
if (result != ISC_R_SUCCESS)
goto cleanup;
- result = zonemgr_getio(zone->zmgr, ISC_TRUE, zone->task,
+ result = zonemgr_getio(zone->zmgr, ISC_TRUE, zone->task,
zone_gotreadhandle, load,
&zone->readio);
if (result != ISC_R_SUCCESS) {
memcpy(new, notify, count * sizeof(*new));
zone->notify = new;
zone->notifycnt = count;
- }
+ }
UNLOCK_ZONE(zone);
return (ISC_R_SUCCESS);
}
static inline isc_boolean_t
was_dumping(dns_zone_t *zone) {
isc_boolean_t dumping;
-
+
REQUIRE(LOCKED_ZONE(zone));
dumping = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING);
/*
* When lacking user-specified timer values from the SOA,
- * do exponential backoff of the retry time up to a
+ * do exponential backoff of the retry time up to a
* maximum of six hours.
*/
if (! DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HAVETIMERS))
again = ISC_TRUE;
} else if (result == ISC_R_SUCCESS)
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_FLUSH);
-
+
if (zone->dctx != NULL)
dns_dumpctx_detach(&zone->dctx);
UNLOCK_ZONE(zone);
goto fail;
}
-
if (compact) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
zone_iattach(zone, &dummy);
- result = zonemgr_getio(zone->zmgr, ISC_FALSE, zone->task,
+ result = zonemgr_getio(zone->zmgr, ISC_FALSE, zone->task,
zone_gotwritehandle, zone,
&zone->writeio);
if (result != ISC_R_SUCCESS)
else
result = DNS_R_CONTINUE;
UNLOCK_ZONE(zone);
- } else {
+ } else {
dns_db_currentversion(db, &version);
result = dns_master_dump(zone->mctx, db, version,
- &dns_master_style_default,
+ &dns_master_style_default,
masterfile);
dns_db_closeversion(db, &version, ISC_FALSE);
}
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_DUMPING);
isc_time_settoepoch(&zone->dumptime);
again = ISC_TRUE;
- } else
+ } else
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_FLUSH);
UNLOCK_ZONE(zone);
if (again)
/*
* 'zone' locked by caller.
- */
+ */
REQUIRE(LOCKED_ZONE(zone));
if (notify->zone->view->adb == NULL)
goto destroy;
-
+
result = dns_adb_createfind(notify->zone->view->adb,
notify->zone->task,
process_adb_event, notify,
if (DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_DIALNOTIFY))
timeout = 30;
result = dns_request_createvia2(notify->zone->view->requestmgr,
- message, &src, ¬ify->dst, 0, key,
+ message, &src, ¬ify->dst, 0, key,
timeout * 3, timeout,
notify->zone->task, notify_done,
notify, ¬ify->request);
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH))
timeout = 30;
result = dns_request_createvia2(zone->view->requestmgr, message,
- &zone->sourceaddr, &zone->masteraddr,
+ &zone->sourceaddr, &zone->masteraddr,
options, key, timeout * 3, timeout,
zone->task, refresh_callback, zone,
&zone->request);
if (zone->db != NULL)
dns_db_attach(zone->db, &stub->db);
else {
- INSIST(zone->db_argc >= 1);
+ INSIST(zone->db_argc >= 1);
result = dns_db_create(zone->mctx, zone->db_argv[0],
&zone->origin, dns_dbtype_stub,
zone->rdclass,
dns_zone_log(zone, ISC_LOG_ERROR,
"refreshing stub: "
"could not create "
- "database: %s",
+ "database: %s",
dns_result_totext(result));
goto cleanup;
}
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH))
timeout = 30;
result = dns_request_createvia2(zone->view->requestmgr, message,
- &zone->sourceaddr, &zone->masteraddr,
- DNS_REQUESTOPT_TCP, key, timeout * 3,
- timeout, zone->task, stub_callback,
+ &zone->sourceaddr, &zone->masteraddr,
+ DNS_REQUESTOPT_TCP, key, timeout * 3,
+ timeout, zone->task, stub_callback,
stub, &zone->request);
if (result != ISC_R_SUCCESS) {
zone_debuglog(zone, me, 1,
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) &&
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) {
INSIST(!isc_time_isepoch(&zone->dumptime));
- if (isc_time_isepoch(&next) ||
+ if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->dumptime, &next) < 0)
next = zone->dumptime;
}
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOREFRESH) &&
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADING)) {
INSIST(!isc_time_isepoch(&zone->refreshtime));
- if (isc_time_isepoch(&next) ||
+ if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->refreshtime, &next) < 0)
next = zone->refreshtime;
}
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
INSIST(!isc_time_isepoch(&zone->expiretime));
- if (isc_time_isepoch(&next) ||
+ if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->expiretime, &next) < 0)
next = zone->expiretime;
}
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) &&
!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) {
INSIST(!isc_time_isepoch(&zone->dumptime));
- if (isc_time_isepoch(&next) ||
+ if (isc_time_isepoch(&next) ||
isc_time_compare(&zone->dumptime, &next) < 0)
next = zone->dumptime;
}
isc_netaddr_fromsockaddr(&netaddr, from);
if (i >= zone->masterscnt && zone->notify_acl != NULL &&
dns_acl_match(&netaddr, NULL, zone->notify_acl,
- &zone->view->aclenv,
+ &zone->view->aclenv,
&match, NULL) == ISC_R_SUCCESS &&
match > 0)
{
if (isc_buffer_availablelength(&buffer) > 0)
isc_buffer_putstr(&buffer, "/");
(void)dns_rdataclass_totext(zone->rdclass, &buffer);
-
+
if (zone->view != NULL && strcmp(zone->view->name, "_bind") != 0 &&
strcmp(zone->view->name, "_default") != 0 &&
strlen(zone->view->name) < isc_buffer_availablelength(&buffer)) {
(void)remove(zone->journal);
}
}
-
+
dns_db_closeversion(db, &ver, ISC_FALSE);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
dns_zone_t *zone;
UNUSED(task);
-
+
forward = revent->ev_arg;
INSIST(DNS_FORWARD_VALID(forward));
zone = forward->zone;
INSIST(DNS_ZONE_VALID(zone));
-
+
ENTER;
-
+
isc_sockaddr_format(&forward->addr, master, sizeof(master));
if (revent->result != ISC_R_SUCCESS) {
forward->callback = callback;
forward->callback_arg = callback_arg;
forward->magic = FORWARD_MAGIC;
-
+
mr = dns_message_getrawmessage(msg);
if (mr == NULL) {
result = ISC_R_UNEXPECTEDEND;
result = isc_buffer_copyregion(forward->msgbuf, mr);
if (result != ISC_R_SUCCESS)
goto cleanup;
-
+
isc_mem_attach(zone->mctx, &forward->mctx);
dns_zone_iattach(zone, &forward->zone);
result = sendtomaster(forward);
* An event will be sent to action when one is available.
* There are two queues available (high and low), the high
* queue will be serviced before the low one.
- *
+ *
* zonemgr_putio() must be called after the event is delivered to
* 'action'.
*/
return (ISC_R_NOMEMORY);
}
io->zmgr = zmgr;
- io->high = high;
+ io->high = high;
io->task = NULL;
isc_task_attach(task, &io->task);
- ISC_LINK_INIT(io, link);
+ ISC_LINK_INIT(io, link);
io->magic = IO_MAGIC;
LOCK(&zmgr->iolock);
send_event = ISC_TRUE;
INSIST(io->event != NULL);
- }
+ }
UNLOCK(&io->zmgr->iolock);
if (send_event) {
io->event->ev_attributes |= ISC_EVENTATTR_CANCELED;
char *buf;
int buflen;
isc_result_t result;
-
+
buflen = strlen(path) + strlen(templat) + 2;
buf = isc_mem_get(zone->mctx, buflen);
if (value == 1) {
s = 1;
ns = 0;
- pertic = 1;
+ pertic = 1;
} else if (value <= 10) {
s = 0;
ns = 1000000000 / value;
isc_result_t
dns_zone_setstatistics(dns_zone_t *zone, isc_boolean_t on) {
- isc_result_t result = ISC_R_SUCCESS;
+ isc_result_t result = ISC_R_SUCCESS;
LOCK_ZONE(zone);
if (on) {
} else {
if (zone->counters == NULL)
goto done;
- dns_stats_freecounters(zone->mctx, &zone->counters);
+ dns_stats_freecounters(zone->mctx, &zone->counters);
}
done:
UNLOCK_ZONE(zone);
void
dns_zone_dialup(dns_zone_t *zone) {
-
+
REQUIRE(DNS_ZONE_VALID(zone));
zone_debuglog(zone, "dns_zone_dialup", 3,
"notify = %d, refresh = %d",
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALNOTIFY),
DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH));
-
+
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALNOTIFY))
dns_zone_notify(zone);
if (zone->type != dns_zone_master &&
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.78 2003/07/25 02:22:26 marka Exp $
+# $Id: Makefile.in,v 1.79 2003/10/17 03:46:45 marka Exp $
srcdir = @srcdir@
VPATH = @srcdir@
unix/errno2result.@O@ unix/file.@O@ unix/fsaccess.@O@ \
unix/interfaceiter.@O@ unix/keyboard.@O@ unix/net.@O@ \
unix/os.@O@ unix/resource.@O@ unix/socket.@O@ unix/stdio.@O@ \
- unix/strerror.@O@ unix/stdtime.@O@ unix/syslog.@O@ unix/time.@O@
+ unix/stdtime.@O@ unix/strerror.@O@ unix/syslog.@O@ unix/time.@O@
NLSOBJS = nls/msgcat.@O@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: time.c,v 1.35 2001/12/19 03:46:55 mayer Exp $ */
+/* $Id: time.c,v 1.36 2003/10/17 03:46:45 marka Exp $ */
#include <config.h>
REQUIRE(len > 0);
if (FileTimeToLocalFileTime(&t->absolute, &localft) &&
FileTimeToSystemTime(&localft, &st)) {
- GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, "dd-MMM-yyyy", DateBuf,
- 50);
+ GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, "dd-MMM-yyyy",
+ DateBuf, 50);
GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOTIMEMARKER|
TIME_FORCE24HOURFORMAT, &st, NULL, TimeBuf, 50);
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# $Id: rules.in,v 1.44 2002/12/13 02:00:16 marka Exp $
+# $Id: rules.in,v 1.45 2003/10/17 03:46:46 marka Exp $
###
### Common Makefile rules for BIND 9.
#
.docbook.html:
${OPENJADE} -c ${SGMLCATALOG} -t sgml -d ${HTMLSTYLE} $<
+ echo "" >> r1.htm
cat ${top_srcdir}/docutil/HTML_COPYRIGHT r1.htm > $@
rm -f r1.htm
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# $Id: merge_copyrights,v 1.16 2001/01/09 22:00:53 bwelling Exp $
+# $Id: merge_copyrights,v 1.17 2003/10/17 03:46:46 marka Exp $
%file_types = ();
%file_years = ();
next if (m%/\.\# | # CVS old conflict file
/CVS/ | # CVS directory
+ util/newcopyrights | # our output
\.bak$ | # created by update_copyrights
/(dnssafe|openssl)/.*\.[ch]$ | # imported
doc/(draft|expired|rfc)/ # imported
projects / thirdparty / bind9.git / commitdiff
