Commit fcb54ce0 authored by Mark Andrews's avatar Mark Andrews

whitespace / layout

parent bb030ee8
......@@ -13,7 +13,7 @@
# 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@
......@@ -65,9 +65,10 @@ named-checkzone.@O@: named-checkzone.c
${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@ \
......
......@@ -15,7 +15,7 @@
* 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>
......
......@@ -15,7 +15,7 @@
* 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>
......
......@@ -66,6 +66,7 @@
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
......@@ -15,7 +15,7 @@
* 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
......@@ -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))
return (result);
/*
* The entry is not in use. Delete it.
*/
......@@ -3266,7 +3267,8 @@ fetch_name(dns_adbname_t *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);
......
......@@ -15,7 +15,7 @@
* 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
......
......@@ -15,7 +15,7 @@
* 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
......
......@@ -15,7 +15,7 @@
* 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
......@@ -161,7 +161,7 @@ dns_rdata_reset(dns_rdata_t *rdata);
* 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
......
......@@ -15,7 +15,7 @@
* 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>
......@@ -1002,7 +1002,7 @@ static isc_result_t
task_send(dns_dumpctx_t *dctx) {
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));
if (event == NULL)
return (ISC_R_NOMEMORY);
......@@ -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);
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;
......@@ -1067,7 +1067,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
*dctxp = dctx;
return (ISC_R_SUCCESS);
cleanup:
cleanup:
if (dctx->dbiter != NULL)
dns_dbiterator_destroy(&dctx->dbiter);
if (dctx->db != NULL)
......
......@@ -15,7 +15,7 @@
* 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>
......
/*
* 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
......@@ -15,7 +15,7 @@
* 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>
......
......@@ -15,7 +15,7 @@
* 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>
......@@ -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
* 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
......@@ -4995,11 +4994,6 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
/*
* 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) &&
......@@ -5021,14 +5015,8 @@ oldcounts[DNS_SECTION_ADDITIONAL] = message->counts[DNS_SECTION_ADDITIONAL];
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);
}
/*
......
......@@ -15,7 +15,7 @@
* 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>
......
......@@ -15,7 +15,7 @@
* 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>
......@@ -2412,7 +2412,6 @@ zone_dump(dns_zone_t *zone, isc_boolean_t compact) {
goto fail;
}
if (compact) {
dns_zone_t *dummy = NULL;
LOCK_ZONE(zone);
......
......@@ -13,7 +13,7 @@
# 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@
......@@ -36,7 +36,7 @@ UNIXOBJS = @ISC_ISCIPV6_O@ \
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@
......
......@@ -15,7 +15,7 @@
* 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>
......@@ -225,8 +225,8 @@ isc_time_formattimestamp(const isc_time_t *t, char *buf, unsigned int len) {
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);
......
......@@ -13,7 +13,7 @@
# 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.
......@@ -201,6 +201,7 @@ SGMLSPL = sgmlspl
#
.docbook.html:
${OPENJADE} -c ${SGMLCATALOG} -t sgml -d ${HTMLSTYLE} $<
echo "" >> r1.htm
cat ${top_srcdir}/docutil/HTML_COPYRIGHT r1.htm > $@
rm -f r1.htm
......
......@@ -15,7 +15,7 @@
# 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 = ();
......@@ -40,6 +40,7 @@ while (<FILES>) {
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment