mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

update copyright notice

Browse Source
This commit is contained in:
Automatic Updater 2008-04-01 23:47:10 +00:00
parent 713a5e3080
commit e672951ed2
36 changed files with 265 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/dnssec/Makefile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000-2002 Internet Software Consortium. # Copyright (C) 2000-2002 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
@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.33 2008/03/31 14:42:50 fdupont Exp $ # $Id: Makefile.in,v 1.34 2008/04/01 23:47:10 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

4
bin/named/bind9.xsl
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
- Copyright (C) 2006, 2007 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2006-2008 Internet Systems Consortium, Inc. ("ISC")
- -
- Permission to use, copy, modify, and/or distribute this software for any - Permission to use, copy, modify, and/or 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 @@
- PERFORMANCE OF THIS SOFTWARE. - PERFORMANCE OF THIS SOFTWARE.
--> -->
<!-- $Id: bind9.xsl,v 1.14 2008/03/31 05:00:29 marka Exp $ --> <!-- $Id: bind9.xsl,v 1.15 2008/04/01 23:47:10 tbox Exp $ -->
<xsl:stylesheet version="1.0" <xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"

2
bin/named/update.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: update.c,v 1.143 2008/04/01 01:37:24 marka Exp $ */ /* $Id: update.c,v 1.144 2008/04/01 23:47:10 tbox Exp $ */
#include <config.h> #include <config.h>

4
lib/dns/Makefile.in
View File

@ -1,4 +1,4 @@
# 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
@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.161 2008/04/01 05:19:00 marka Exp $ # $Id: Makefile.in,v 1.162 2008/04/01 23:47:10 tbox Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@

14
lib/dns/db.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001, 2003 Internet Software Consortium. * Copyright (C) 1999-2001, 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: db.c,v 1.85 2008/04/01 03:02:20 marka Exp $ */ /* $Id: db.c,v 1.86 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -558,10 +558,10 @@ dns_db_transfernode(dns_db_t *db, dns_dbnode_t **sourcep,
UNUSED(db); UNUSED(db);
if (db->methods->transfernode == NULL) { if (db->methods->transfernode == NULL) {
*targetp = *sourcep; *targetp = *sourcep;
*sourcep = NULL; *sourcep = NULL;
} else } else
(db->methods->transfernode)(db, sourcep, targetp); (db->methods->transfernode)(db, sourcep, targetp);
ENSURE(*sourcep == NULL); ENSURE(*sourcep == NULL);
} }
@ -752,11 +752,11 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp)
dns_rdataset_init(&rdataset); dns_rdataset_init(&rdataset);
result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0, result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0,
(isc_stdtime_t)0, &rdataset, NULL); (isc_stdtime_t)0, &rdataset, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto freenode; goto freenode;
result = dns_rdataset_first(&rdataset); result = dns_rdataset_first(&rdataset);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto freerdataset; goto freerdataset;
dns_rdataset_current(&rdataset, &rdata); dns_rdataset_current(&rdataset, &rdata);
result = dns_rdataset_next(&rdataset); result = dns_rdataset_next(&rdataset);

8
lib/dns/diff.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium. * Copyright (C) 2000-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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: diff.c,v 1.15 2008/04/01 01:37:24 marka Exp $ */ /* $Id: diff.c,v 1.16 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -320,7 +320,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
sizeof(classbuf)); sizeof(classbuf));
if (t->ttl != rdl.ttl && warn) if (t->ttl != rdl.ttl && warn)
isc_log_write(DIFF_COMMON_LOGARGS, isc_log_write(DIFF_COMMON_LOGARGS,
ISC_LOG_WARNING, ISC_LOG_WARNING,
"'%s/%s/%s': TTL differs in " "'%s/%s/%s': TTL differs in "
"rdataset, adjusting " "rdataset, adjusting "
"%lu -> %lu", "%lu -> %lu",
@ -384,7 +384,7 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
resign); resign);
} }
} else if (result == DNS_R_UNCHANGED) { } else if (result == DNS_R_UNCHANGED) {
/* /*
* This will not happen when executing a * This will not happen when executing a
* dynamic update, because that code will * dynamic update, because that code will
* generate strictly minimal diffs. * generate strictly minimal diffs.

4
lib/dns/dst_api.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium. * Portions 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
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.13 2008/03/31 14:42:51 fdupont Exp $ * $Id: dst_api.c,v 1.14 2008/04/01 23:47:10 tbox Exp $
*/ */
/*! \file */ /*! \file */

4
lib/dns/dst_internal.h
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2000-2002 Internet Software Consortium. * Portions Copyright (C) 2000-2002 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
@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst_internal.h,v 1.10 2008/03/31 14:42:51 fdupont Exp $ */ /* $Id: dst_internal.h,v 1.11 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DST_DST_INTERNAL_H #ifndef DST_DST_INTERNAL_H
#define DST_DST_INTERNAL_H 1 #define DST_DST_INTERNAL_H 1

4
lib/dns/dst_openssl.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2002 Internet Software Consortium. * Copyright (C) 2002 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst_openssl.h,v 1.6 2008/03/31 14:42:51 fdupont Exp $ */ /* $Id: dst_openssl.h,v 1.7 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DST_OPENSSL_H #ifndef DST_OPENSSL_H
#define DST_OPENSSL_H 1 #define DST_OPENSSL_H 1

4
lib/dns/dst_parse.h
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2000-2002 Internet Software Consortium. * Portions Copyright (C) 2000-2002 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
@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst_parse.h,v 1.9 2008/03/31 14:42:51 fdupont Exp $ */ /* $Id: dst_parse.h,v 1.10 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
#ifndef DST_DST_PARSE_H #ifndef DST_DST_PARSE_H

4
lib/dns/dst_result.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-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
@ -17,7 +17,7 @@
/*% /*%
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_result.c,v 1.6 2008/03/31 14:42:51 fdupont Exp $ * $Id: dst_result.c,v 1.7 2008/04/01 23:47:10 tbox Exp $
*/ */
#include <config.h> #include <config.h>

16
lib/dns/hmac_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 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
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: hmac_link.c,v 1.10 2008/03/31 14:42:51 fdupont Exp $ * $Id: hmac_link.c,v 1.11 2008/04/01 23:47:10 tbox Exp $
*/ */
#include <config.h> #include <config.h>
@ -285,7 +285,7 @@ hmacmd5_parse(dst_key_t *key, isc_lex_t *lexer) {
switch (priv.elements[i].tag) { switch (priv.elements[i].tag) {
case TAG_HMACMD5_KEY: case TAG_HMACMD5_KEY:
isc_buffer_init(&b, priv.elements[i].data, isc_buffer_init(&b, priv.elements[i].data,
priv.elements[i].length); priv.elements[i].length);
isc_buffer_add(&b, priv.elements[i].length); isc_buffer_add(&b, priv.elements[i].length);
tresult = hmacmd5_fromdns(key, &b); tresult = hmacmd5_fromdns(key, &b);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
@ -555,7 +555,7 @@ hmacsha1_parse(dst_key_t *key, isc_lex_t *lexer) {
switch (priv.elements[i].tag) { switch (priv.elements[i].tag) {
case TAG_HMACSHA1_KEY: case TAG_HMACSHA1_KEY:
isc_buffer_init(&b, priv.elements[i].data, isc_buffer_init(&b, priv.elements[i].data,
priv.elements[i].length); priv.elements[i].length);
isc_buffer_add(&b, priv.elements[i].length); isc_buffer_add(&b, priv.elements[i].length);
tresult = hmacsha1_fromdns(key, &b); tresult = hmacsha1_fromdns(key, &b);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
@ -825,7 +825,7 @@ hmacsha224_parse(dst_key_t *key, isc_lex_t *lexer) {
switch (priv.elements[i].tag) { switch (priv.elements[i].tag) {
case TAG_HMACSHA224_KEY: case TAG_HMACSHA224_KEY:
isc_buffer_init(&b, priv.elements[i].data, isc_buffer_init(&b, priv.elements[i].data,
priv.elements[i].length); priv.elements[i].length);
isc_buffer_add(&b, priv.elements[i].length); isc_buffer_add(&b, priv.elements[i].length);
tresult = hmacsha224_fromdns(key, &b); tresult = hmacsha224_fromdns(key, &b);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
@ -1095,7 +1095,7 @@ hmacsha256_parse(dst_key_t *key, isc_lex_t *lexer) {
switch (priv.elements[i].tag) { switch (priv.elements[i].tag) {
case TAG_HMACSHA256_KEY: case TAG_HMACSHA256_KEY:
isc_buffer_init(&b, priv.elements[i].data, isc_buffer_init(&b, priv.elements[i].data,
priv.elements[i].length); priv.elements[i].length);
isc_buffer_add(&b, priv.elements[i].length); isc_buffer_add(&b, priv.elements[i].length);
tresult = hmacsha256_fromdns(key, &b); tresult = hmacsha256_fromdns(key, &b);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
@ -1365,7 +1365,7 @@ hmacsha384_parse(dst_key_t *key, isc_lex_t *lexer) {
switch (priv.elements[i].tag) { switch (priv.elements[i].tag) {
case TAG_HMACSHA384_KEY: case TAG_HMACSHA384_KEY:
isc_buffer_init(&b, priv.elements[i].data, isc_buffer_init(&b, priv.elements[i].data,
priv.elements[i].length); priv.elements[i].length);
isc_buffer_add(&b, priv.elements[i].length); isc_buffer_add(&b, priv.elements[i].length);
tresult = hmacsha384_fromdns(key, &b); tresult = hmacsha384_fromdns(key, &b);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
@ -1635,7 +1635,7 @@ hmacsha512_parse(dst_key_t *key, isc_lex_t *lexer) {
switch (priv.elements[i].tag) { switch (priv.elements[i].tag) {
case TAG_HMACSHA512_KEY: case TAG_HMACSHA512_KEY:
isc_buffer_init(&b, priv.elements[i].data, isc_buffer_init(&b, priv.elements[i].data,
priv.elements[i].length); priv.elements[i].length);
isc_buffer_add(&b, priv.elements[i].length); isc_buffer_add(&b, priv.elements[i].length);
tresult = hmacsha512_fromdns(key, &b); tresult = hmacsha512_fromdns(key, &b);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)

4
lib/dns/include/dns/db.h
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: db.h,v 1.90 2008/04/01 01:37:25 marka Exp $ */ /* $Id: db.h,v 1.91 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_DB_H #ifndef DNS_DB_H
#define DNS_DB_H 1 #define DNS_DB_H 1

4
lib/dns/include/dns/diff.h
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: diff.h,v 1.13 2008/04/01 01:37:25 marka Exp $ */ /* $Id: diff.h,v 1.14 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_DIFF_H #ifndef DNS_DIFF_H
#define DNS_DIFF_H 1 #define DNS_DIFF_H 1

4
lib/dns/include/dns/journal.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: journal.h,v 1.32 2008/04/01 01:37:25 marka Exp $ */ /* $Id: journal.h,v 1.33 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_JOURNAL_H #ifndef DNS_JOURNAL_H
#define DNS_JOURNAL_H 1 #define DNS_JOURNAL_H 1

4
lib/dns/include/dns/master.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: master.h,v 1.49 2008/04/01 01:37:25 marka Exp $ */ /* $Id: master.h,v 1.50 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_MASTER_H #ifndef DNS_MASTER_H
#define DNS_MASTER_H 1 #define DNS_MASTER_H 1

4
lib/dns/include/dns/masterdump.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: masterdump.h,v 1.40 2008/04/01 01:37:25 marka Exp $ */ /* $Id: masterdump.h,v 1.41 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_MASTERDUMP_H #ifndef DNS_MASTERDUMP_H
#define DNS_MASTERDUMP_H 1 #define DNS_MASTERDUMP_H 1

4
lib/dns/include/dns/rdata.h
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdata.h,v 1.68 2008/04/01 01:37:25 marka Exp $ */ /* $Id: rdata.h,v 1.69 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_RDATA_H #ifndef DNS_RDATA_H
#define DNS_RDATA_H 1 #define DNS_RDATA_H 1

4
lib/dns/include/dns/rdataset.h
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdataset.h,v 1.63 2008/04/01 01:37:25 marka Exp $ */ /* $Id: rdataset.h,v 1.64 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_RDATASET_H #ifndef DNS_RDATASET_H
#define DNS_RDATASET_H 1 #define DNS_RDATASET_H 1

4
lib/dns/include/dns/rdataslab.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdataslab.h,v 1.32 2008/04/01 01:37:25 marka Exp $ */ /* $Id: rdataslab.h,v 1.33 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DNS_RDATASLAB_H #ifndef DNS_RDATASLAB_H
#define DNS_RDATASLAB_H 1 #define DNS_RDATASLAB_H 1

10
lib/dns/include/dst/dst.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2002 Internet Software Consortium. * Copyright (C) 2000-2002 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dst.h,v 1.10 2008/03/31 14:42:51 fdupont Exp $ */ /* $Id: dst.h,v 1.11 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DST_DST_H #ifndef DST_DST_H
#define DST_DST_H 1 #define DST_DST_H 1
@ -436,9 +436,9 @@ dst_key_fromgssapi(dns_name_t *name, gss_ctx_id_t gssctx, isc_mem_t *mctx,
isc_result_t isc_result_t
dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags, dst_key_fromlabel(dns_name_t *name, int alg, unsigned int flags,
unsigned int protocol, dns_rdataclass_t rdclass, unsigned int protocol, dns_rdataclass_t rdclass,
const char *engine, const char *label, const char *pin, const char *engine, const char *label, const char *pin,
isc_mem_t *mctx, dst_key_t **keyp); isc_mem_t *mctx, dst_key_t **keyp);
isc_result_t isc_result_t
dst_key_generate(dns_name_t *name, unsigned int alg, dst_key_generate(dns_name_t *name, unsigned int alg,

4
lib/dns/include/dst/result.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001 Internet Software Consortium. * Copyright (C) 1999-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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: result.h,v 1.8 2008/03/31 14:42:51 fdupont Exp $ */ /* $Id: result.h,v 1.9 2008/04/01 23:47:10 tbox Exp $ */
#ifndef DST_RESULT_H #ifndef DST_RESULT_H
#define DST_RESULT_H 1 #define DST_RESULT_H 1

10
lib/dns/journal.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium. * Copyright (C) 1999-2002 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: journal.c,v 1.100 2008/04/01 01:37:24 marka Exp $ */ /* $Id: journal.c,v 1.101 2008/04/01 23:47:10 tbox Exp $ */
#include <config.h> #include <config.h>
@ -107,7 +107,7 @@ static isc_boolean_t bind8_compat = ISC_TRUE; /* XXX config */
} while (0) } while (0)
#define CHECK(op) \ #define CHECK(op) \
do { result = (op); \ do { result = (op); \
if (result != ISC_R_SUCCESS) goto failure; \ if (result != ISC_R_SUCCESS) goto failure; \
} while (0) } while (0)
@ -149,11 +149,11 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx,
dns_rdataset_init(&rdataset); dns_rdataset_init(&rdataset);
result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0, result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0,
(isc_stdtime_t)0, &rdataset, NULL); (isc_stdtime_t)0, &rdataset, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto freenode; goto freenode;
result = dns_rdataset_first(&rdataset); result = dns_rdataset_first(&rdataset);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto freenode; goto freenode;
dns_rdataset_current(&rdataset, &rdata); dns_rdataset_current(&rdataset, &rdata);

6
lib/dns/masterdump.c
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: masterdump.c,v 1.90 2008/04/01 01:37:24 marka Exp $ */ /* $Id: masterdump.c,v 1.91 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -1081,7 +1081,7 @@ dns_dumpctx_detach(dns_dumpctx_t **dctxp) {
dns_dbversion_t * dns_dbversion_t *
dns_dumpctx_version(dns_dumpctx_t *dctx) { dns_dumpctx_version(dns_dumpctx_t *dctx) {
REQUIRE(DNS_DCTX_VALID(dctx)); REQUIRE(DNS_DCTX_VALID(dctx));
return (dctx->version); return (dctx->version);
} }

4
lib/dns/name.c
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: name.c,v 1.164 2008/03/31 05:00:30 marka Exp $ */ /* $Id: name.c,v 1.165 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */

12
lib/dns/openssl_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2003 Internet Software Consortium. * Portions 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
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: openssl_link.c,v 1.17 2008/03/31 14:42:51 fdupont Exp $ * $Id: openssl_link.c,v 1.18 2008/04/01 23:47:10 tbox Exp $
*/ */
#ifdef OPENSSL #ifdef OPENSSL
@ -81,8 +81,8 @@ static ENGINE *he;
#ifdef USE_PKCS11 #ifdef USE_PKCS11
static isc_result_t static isc_result_t
dst__openssl_load_engine(const char *name, const char *engine_id, dst__openssl_load_engine(const char *name, const char *engine_id,
const char **pre_cmds, int pre_num, const char **pre_cmds, int pre_num,
const char **post_cmds, int post_num); const char **post_cmds, int post_num);
#endif #endif
static int static int
@ -388,8 +388,8 @@ dst__openssl_setdefault(const char *name) {
*/ */
static isc_result_t static isc_result_t
dst__openssl_load_engine(const char *name, const char *engine_id, dst__openssl_load_engine(const char *name, const char *engine_id,
const char **pre_cmds, int pre_num, const char **pre_cmds, int pre_num,
const char **post_cmds, int post_num) const char **post_cmds, int post_num)
{ {
ENGINE *e; ENGINE *e;

6
lib/dns/openssldh_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 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
@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: openssldh_link.c,v 1.13 2008/03/31 14:42:51 fdupont Exp $ * $Id: openssldh_link.c,v 1.14 2008/04/01 23:47:10 tbox Exp $
*/ */
#ifdef OPENSSL #ifdef OPENSSL
@ -152,7 +152,7 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
static isc_result_t static isc_result_t
openssldh_generate(dst_key_t *key, int generator) { openssldh_generate(dst_key_t *key, int generator) {
#if OPENSSL_VERSION_NUMBER > 0x00908000L #if OPENSSL_VERSION_NUMBER > 0x00908000L
BN_GENCB cb; BN_GENCB cb;
#endif #endif
DH *dh = NULL; DH *dh = NULL;

12
lib/dns/openssldsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2002 Internet Software Consortium. * Portions Copyright (C) 1999-2002 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
@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: openssldsa_link.c,v 1.12 2008/03/31 14:42:51 fdupont Exp $ */ /* $Id: openssldsa_link.c,v 1.13 2008/04/01 23:47:10 tbox Exp $ */
#ifdef OPENSSL #ifdef OPENSSL
#ifndef USE_EVP #ifndef USE_EVP
@ -138,8 +138,8 @@ openssldsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
isc_region_t r; isc_region_t r;
DSA_SIG *dsasig; DSA_SIG *dsasig;
#if USE_EVP #if USE_EVP
EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx; EVP_MD_CTX *evp_md_ctx = dctx->ctxdata.evp_md_ctx;
EVP_PKEY *pkey; EVP_PKEY *pkey;
unsigned char *sigbuf; unsigned char *sigbuf;
const unsigned char *sb; const unsigned char *sb;
unsigned int siglen; unsigned int siglen;
@ -316,7 +316,7 @@ openssldsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
static isc_result_t static isc_result_t
openssldsa_generate(dst_key_t *key, int unused) { openssldsa_generate(dst_key_t *key, int unused) {
#if OPENSSL_VERSION_NUMBER > 0x00908000L #if OPENSSL_VERSION_NUMBER > 0x00908000L
BN_GENCB cb; BN_GENCB cb;
#endif #endif
DSA *dsa; DSA *dsa;
unsigned char rand_array[ISC_SHA1_DIGESTLENGTH]; unsigned char rand_array[ISC_SHA1_DIGESTLENGTH];
@ -330,7 +330,7 @@ openssldsa_generate(dst_key_t *key, int unused) {
return (result); return (result);
#if OPENSSL_VERSION_NUMBER > 0x00908000L #if OPENSSL_VERSION_NUMBER > 0x00908000L
dsa = DSA_new(); dsa = DSA_new();
if (dsa == NULL) if (dsa == NULL)
return (dst__openssl_toresult(DST_R_OPENSSLFAILURE)); return (dst__openssl_toresult(DST_R_OPENSSLFAILURE));

4
lib/dns/opensslrsa_link.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium. * Copyright (C) 2000-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
@ -17,7 +17,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: opensslrsa_link.c,v 1.18 2008/04/01 00:03:31 marka Exp $ * $Id: opensslrsa_link.c,v 1.19 2008/04/01 23:47:10 tbox Exp $
*/ */
#ifdef OPENSSL #ifdef OPENSSL
#ifndef USE_EVP #ifndef USE_EVP

86
lib/dns/rbtdb.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rbtdb.c,v 1.253 2008/04/01 01:37:24 marka Exp $ */ /* $Id: rbtdb.c,v 1.254 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -263,7 +263,7 @@ typedef struct rdatasetheader {
/*%< /*%<
* Used for TTL-based cache cleaning. * Used for TTL-based cache cleaning.
*/ */
isc_stdtime_t resign; isc_stdtime_t resign;
} rdatasetheader_t; } rdatasetheader_t;
typedef ISC_LIST(rdatasetheader_t) rdatasetheaderlist_t; typedef ISC_LIST(rdatasetheader_t) rdatasetheaderlist_t;
@ -312,7 +312,7 @@ struct acachectl {
#define NXDOMAIN(header) \ #define NXDOMAIN(header) \
(((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0) (((header)->attributes & RDATASET_ATTR_NXDOMAIN) != 0)
#define RESIGN(header) \ #define RESIGN(header) \
(((header)->attributes & RDATASET_ATTR_RESIGN) != 0) (((header)->attributes & RDATASET_ATTR_RESIGN) != 0)
#define DEFAULT_NODE_LOCK_COUNT 7 /*%< Should be prime. */ #define DEFAULT_NODE_LOCK_COUNT 7 /*%< Should be prime. */
#define DEFAULT_CACHE_NODE_LOCK_COUNT 1009 /*%< Should be prime. */ #define DEFAULT_CACHE_NODE_LOCK_COUNT 1009 /*%< Should be prime. */
@ -432,7 +432,7 @@ typedef struct {
/* Locked by tree_lock. */ /* Locked by tree_lock. */
dns_rbt_t * tree; dns_rbt_t * tree;
dns_db_secure_t secure; dns_db_secure_t secure;
/* Unlocked */ /* Unlocked */
unsigned int quantum; unsigned int quantum;
@ -705,12 +705,12 @@ ttl_sooner(void *v1, void *v2) {
static isc_boolean_t static isc_boolean_t
resign_sooner(void *v1, void *v2) { resign_sooner(void *v1, void *v2) {
rdatasetheader_t *h1 = v1; rdatasetheader_t *h1 = v1;
rdatasetheader_t *h2 = v2; rdatasetheader_t *h2 = v2;
if (h1->resign < h2->resign) if (h1->resign < h2->resign)
return (ISC_TRUE); return (ISC_TRUE);
return (ISC_FALSE); return (ISC_FALSE);
} }
/*% /*%
@ -856,7 +856,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) {
} }
/* /*
* Clean up LRU / re-signing order lists. * Clean up LRU / re-signing order lists.
*/ */
if (rbtdb->rdatasets != NULL) { if (rbtdb->rdatasets != NULL) {
for (i = 0; i < rbtdb->node_lock_count; i++) for (i = 0; i < rbtdb->node_lock_count; i++)
@ -875,7 +875,7 @@ free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t log, isc_event_t *event) {
rbtdb->node_lock_count * sizeof(rbtnodelist_t)); rbtdb->node_lock_count * sizeof(rbtnodelist_t));
} }
/* /*
* Clean up heap objects. * Clean up heap objects.
*/ */
if (rbtdb->heaps != NULL) { if (rbtdb->heaps != NULL) {
for (i = 0; i < rbtdb->node_lock_count; i++) for (i = 0; i < rbtdb->node_lock_count; i++)
@ -1033,7 +1033,7 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial,
version->writer = writer; version->writer = writer;
version->commit_ok = ISC_FALSE; version->commit_ok = ISC_FALSE;
ISC_LIST_INIT(version->changed_list); ISC_LIST_INIT(version->changed_list);
ISC_LIST_INIT(version->resigned_list); ISC_LIST_INIT(version->resigned_list);
ISC_LINK_INIT(version, link); ISC_LINK_INIT(version, link);
return (version); return (version);
@ -1737,7 +1737,7 @@ iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT;
isc_boolean_t haszonekey = ISC_FALSE; isc_boolean_t haszonekey = ISC_FALSE;
isc_boolean_t hasnsec = ISC_FALSE; isc_boolean_t hasnsec = ISC_FALSE;
isc_boolean_t hasoptbit = ISC_FALSE; isc_boolean_t hasoptbit = ISC_FALSE;
isc_result_t result; isc_result_t result;
dns_rdataset_init(&keyset); dns_rdataset_init(&keyset);
@ -1757,7 +1757,7 @@ iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
dns_rdataset_disassociate(&keyset); dns_rdataset_disassociate(&keyset);
} }
if (!haszonekey) if (!haszonekey)
return (dns_db_insecure); return (dns_db_insecure);
dns_rdataset_init(&nsecset); dns_rdataset_init(&nsecset);
dns_rdataset_init(&signsecset); dns_rdataset_init(&signsecset);
@ -1779,7 +1779,7 @@ iszonesecure(dns_db_t *db, dns_dbnode_t *origin) {
if (hasnsec && hasoptbit) if (hasnsec && hasoptbit)
return (dns_db_partial); return (dns_db_partial);
return (hasnsec ? dns_db_secure : dns_db_insecure); return (hasnsec ? dns_db_secure : dns_db_insecure);
} }
static void static void
@ -1892,7 +1892,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
PREPEND(rbtdb->open_versions, PREPEND(rbtdb->open_versions,
rbtdb->current_version, link); rbtdb->current_version, link);
resigned_list = version->resigned_list; resigned_list = version->resigned_list;
ISC_LIST_INIT(version->resigned_list); ISC_LIST_INIT(version->resigned_list);
} else { } else {
/* /*
* We're rolling back this transaction. * We're rolling back this transaction.
@ -1900,7 +1900,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
cleanup_list = version->changed_list; cleanup_list = version->changed_list;
ISC_LIST_INIT(version->changed_list); ISC_LIST_INIT(version->changed_list);
resigned_list = version->resigned_list; resigned_list = version->resigned_list;
ISC_LIST_INIT(version->resigned_list); ISC_LIST_INIT(version->resigned_list);
rollback = ISC_TRUE; rollback = ISC_TRUE;
cleanup_version = version; cleanup_version = version;
rbtdb->future_version = NULL; rbtdb->future_version = NULL;
@ -1969,11 +1969,11 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
header = HEAD(resigned_list)) { header = HEAD(resigned_list)) {
ISC_LIST_UNLINK(resigned_list, header, lru_link); ISC_LIST_UNLINK(resigned_list, header, lru_link);
if (rollback) { if (rollback) {
nodelock_t *lock; nodelock_t *lock;
lock = &rbtdb->node_locks[header->node->locknum].lock; lock = &rbtdb->node_locks[header->node->locknum].lock;
NODE_LOCK(lock, isc_rwlocktype_write); NODE_LOCK(lock, isc_rwlocktype_write);
resign_insert(rbtdb, header->node->locknum, header); resign_insert(rbtdb, header->node->locknum, header);
NODE_UNLOCK(lock, isc_rwlocktype_write); NODE_UNLOCK(lock, isc_rwlocktype_write);
} }
decrement_reference(rbtdb, header->node, least_serial, decrement_reference(rbtdb, header->node, least_serial,
isc_rwlocktype_write, isc_rwlocktype_write,
@ -3065,7 +3065,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
* If we're here, then the name does not exist, is not * If we're here, then the name does not exist, is not
* beneath a zonecut, and there's no matching wildcard. * beneath a zonecut, and there's no matching wildcard.
*/ */
if (search.rbtdb->secure == dns_db_secure || if (search.rbtdb->secure == dns_db_secure ||
(search.options & DNS_DBFIND_FORCENSEC) != 0) (search.options & DNS_DBFIND_FORCENSEC) != 0)
{ {
result = find_closest_nsec(&search, nodep, foundname, result = find_closest_nsec(&search, nodep, foundname,
@ -3294,7 +3294,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
* The desired type doesn't exist. * The desired type doesn't exist.
*/ */
result = DNS_R_NXRRSET; result = DNS_R_NXRRSET;
if (search.rbtdb->secure == dns_db_secure && if (search.rbtdb->secure == dns_db_secure &&
(nsecheader == NULL || nsecsig == NULL)) { (nsecheader == NULL || nsecsig == NULL)) {
/* /*
* The zone is secure but there's no NSEC, * The zone is secure but there's no NSEC,
@ -3309,7 +3309,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
NODE_UNLOCK(lock, isc_rwlocktype_read); NODE_UNLOCK(lock, isc_rwlocktype_read);
result = find_closest_nsec(&search, nodep, foundname, result = find_closest_nsec(&search, nodep, foundname,
rdataset, sigrdataset, rdataset, sigrdataset,
search.rbtdb->secure == search.rbtdb->secure ==
dns_db_secure); dns_db_secure);
if (result == ISC_R_SUCCESS) if (result == ISC_R_SUCCESS)
result = DNS_R_EMPTYWILD; result = DNS_R_EMPTYWILD;
@ -3329,7 +3329,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
new_reference(search.rbtdb, node); new_reference(search.rbtdb, node);
*nodep = node; *nodep = node;
} }
if (search.rbtdb->secure == dns_db_secure || if (search.rbtdb->secure == dns_db_secure ||
(search.options & DNS_DBFIND_FORCENSEC) != 0) (search.options & DNS_DBFIND_FORCENSEC) != 0)
{ {
bind_rdataset(search.rbtdb, node, nsecheader, bind_rdataset(search.rbtdb, node, nsecheader,
@ -4618,12 +4618,12 @@ printnode(dns_db_t *db, dns_dbnode_t *node, FILE *out) {
first = ISC_FALSE; first = ISC_FALSE;
fprintf(out, fprintf(out,
"\tserial = %lu, ttl = %u, " "\tserial = %lu, ttl = %u, "
"trust = %u, attributes = %u, " "trust = %u, attributes = %u, "
"resign = %u\n", "resign = %u\n",
(unsigned long)current->serial, (unsigned long)current->serial,
current->rdh_ttl, current->rdh_ttl,
current->trust, current->trust,
current->attributes, current->attributes,
current->resign); current->resign);
current = current->down; current = current->down;
} while (current != NULL); } while (current != NULL);
@ -6073,7 +6073,7 @@ issecure(dns_db_t *db) {
REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(VALID_RBTDB(rbtdb));
RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
secure = ISC_TF(rbtdb->secure == dns_db_secure); secure = ISC_TF(rbtdb->secure == dns_db_secure);
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
return (secure); return (secure);
@ -6081,18 +6081,18 @@ issecure(dns_db_t *db) {
static isc_boolean_t static isc_boolean_t
isdnssec(dns_db_t *db) { isdnssec(dns_db_t *db) {
dns_rbtdb_t *rbtdb; dns_rbtdb_t *rbtdb;
isc_boolean_t dnssec; isc_boolean_t dnssec;
rbtdb = (dns_rbtdb_t *)db; rbtdb = (dns_rbtdb_t *)db;
REQUIRE(VALID_RBTDB(rbtdb)); REQUIRE(VALID_RBTDB(rbtdb));
RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
dnssec = ISC_TF(rbtdb->secure != dns_db_insecure); dnssec = ISC_TF(rbtdb->secure != dns_db_insecure);
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read); RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
return (dnssec); return (dnssec);
} }
static unsigned int static unsigned int
@ -6342,11 +6342,11 @@ static dns_dbmethods_t cache_methods = {
overmem, overmem,
settask, settask,
getoriginnode, getoriginnode,
NULL,
NULL,
NULL, NULL,
NULL, NULL,
isdnssec NULL,
NULL,
isdnssec
}; };
isc_result_t isc_result_t
@ -6551,7 +6551,7 @@ dns_rbtdb_create
return (result); return (result);
} }
rbtdb->attributes = 0; rbtdb->attributes = 0;
rbtdb->secure = dns_db_insecure; rbtdb->secure = dns_db_insecure;
rbtdb->overmem = ISC_FALSE; rbtdb->overmem = ISC_FALSE;
rbtdb->task = NULL; rbtdb->task = NULL;
@ -6730,10 +6730,10 @@ rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
<< DNS_RDATA_WARNSHIFT; << DNS_RDATA_WARNSHIFT;
if (*raw & DNS_RDATASLAB_OFFLINE) if (*raw & DNS_RDATASLAB_OFFLINE)
flags |= DNS_RDATA_OFFLINE; flags |= DNS_RDATA_OFFLINE;
length--; length--;
raw++; raw++;
} }
r.length = length; r.length = length;
r.base = raw; r.base = raw;
dns_rdata_fromregion(rdata, rdataset->rdclass, rdataset->type, &r); dns_rdata_fromregion(rdata, rdataset->rdclass, rdataset->type, &r);
rdata->flags |= flags; rdata->flags |= flags;

16
lib/dns/rdata.c
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdata.c,v 1.197 2008/04/01 01:37:25 marka Exp $ */ /* $Id: rdata.c,v 1.198 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -111,7 +111,7 @@ typedef struct dns_rdata_textctx {
dns_name_t *origin; /*%< Current origin, or NULL. */ dns_name_t *origin; /*%< Current origin, or NULL. */
unsigned int flags; /*%< DNS_STYLEFLAG_* */ unsigned int flags; /*%< DNS_STYLEFLAG_* */
unsigned int width; /*%< Width of rdata column. */ unsigned int width; /*%< Width of rdata column. */
const char *linebreak; /*%< Line break string. */ const char *linebreak; /*%< Line break string. */
} dns_rdata_textctx_t; } dns_rdata_textctx_t;
static isc_result_t static isc_result_t
@ -1505,16 +1505,16 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) {
/* /*
* Because some don't support u_long. * Because some don't support u_long.
*/ */
tmp = 32; tmp = 32;
tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32); tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32);
} }
if (tmpword < 0) { if (tmpword < 0) {
tmp = 64; tmp = 64;
tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32); tmpword -= (isc_int32_t)(85 * 85 * 85 * 85 * 32);
} }
if (tr.length < 5) if (tr.length < 5)
return (ISC_R_NOSPACE); return (ISC_R_NOSPACE);
tr.base[0] = atob_digits[(tmpword / tr.base[0] = atob_digits[(tmpword /
(isc_int32_t)(85 * 85 * 85 * 85)) (isc_int32_t)(85 * 85 * 85 * 85))
+ tmp]; + tmp];
tmpword %= (isc_int32_t)(85 * 85 * 85 * 85); tmpword %= (isc_int32_t)(85 * 85 * 85 * 85);

4
lib/dns/rdataset.c
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdataset.c,v 1.80 2008/04/01 01:37:25 marka Exp $ */ /* $Id: rdataset.c,v 1.81 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */

4
lib/dns/rdataslab.c
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: rdataslab.c,v 1.44 2008/04/01 01:37:25 marka Exp $ */ /* $Id: rdataslab.c,v 1.45 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */

10
lib/dns/sdlz.c
View File

@ -1,5 +1,5 @@
/* /*
* Portions Copyright (C) 2005-2007 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2005-2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1999-2001 Internet Software Consortium. * Portions Copyright (C) 1999-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
@ -50,7 +50,7 @@
* USE OR PERFORMANCE OF THIS SOFTWARE. * USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: sdlz.c,v 1.15 2008/04/01 01:37:25 marka Exp $ */ /* $Id: sdlz.c,v 1.16 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -1332,7 +1332,7 @@ dns_sdlzallowzonexfr(void *driverarg, void *dbdata, isc_mem_t *mctx,
return (result); return (result);
isc_buffer_putuint8(&b2, 0); isc_buffer_putuint8(&b2, 0);
/* make sure strings are always lowercase */ /* make sure strings are always lowercase */
dns_sdlz_tolower(namestr); dns_sdlz_tolower(namestr);
dns_sdlz_tolower(clientstr); dns_sdlz_tolower(clientstr);
@ -1445,7 +1445,7 @@ dns_sdlzfindzone(void *driverarg, void *dbdata, isc_mem_t *mctx,
return (result); return (result);
isc_buffer_putuint8(&b, 0); isc_buffer_putuint8(&b, 0);
/* make sure strings are always lowercase */ /* make sure strings are always lowercase */
dns_sdlz_tolower(namestr); dns_sdlz_tolower(namestr);
/* Call SDLZ driver's find zone method */ /* Call SDLZ driver's find zone method */
@ -1576,7 +1576,7 @@ dns_sdlz_putrr(dns_sdlzlookup_t *lookup, const char *type, dns_ttl_t ttl,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
failure: failure:
if (rdatabuf != NULL) if (rdatabuf != NULL)
isc_buffer_free(&rdatabuf); isc_buffer_free(&rdatabuf);
if (lex != NULL) if (lex != NULL)
isc_lex_destroy(&lex); isc_lex_destroy(&lex);

10
lib/dns/view.c
View File

@ -1,5 +1,5 @@
/* /*
* 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 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: view.c,v 1.144 2008/03/31 05:00:30 marka Exp $ */ /* $Id: view.c,v 1.145 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -322,7 +322,7 @@ destroy(dns_view_t *view) {
name = ISC_LIST_HEAD(view->rootexclude[i]); name = ISC_LIST_HEAD(view->rootexclude[i]);
while (name != NULL) { while (name != NULL) {
ISC_LIST_UNLINK(view->rootexclude[i], ISC_LIST_UNLINK(view->rootexclude[i],
name, link); name, link);
dns_name_free(name, view->mctx); dns_name_free(name, view->mctx);
isc_mem_put(view->mctx, name, sizeof(*name)); isc_mem_put(view->mctx, name, sizeof(*name));
name = ISC_LIST_HEAD(view->rootexclude[i]); name = ISC_LIST_HEAD(view->rootexclude[i]);
@ -1158,8 +1158,8 @@ dns_viewlist_findzone(dns_viewlist_t *list, dns_name_t *name,
REQUIRE(list != NULL); REQUIRE(list != NULL);
for (view = ISC_LIST_HEAD(*list); for (view = ISC_LIST_HEAD(*list);
view != NULL; view != NULL;
view = ISC_LIST_NEXT(view, link)) { view = ISC_LIST_NEXT(view, link)) {
if (allclasses == ISC_FALSE && view->rdclass != rdclass) if (allclasses == ISC_FALSE && view->rdclass != rdclass)
continue; continue;
result = dns_zt_find(view->zonetable, name, 0, NULL, result = dns_zt_find(view->zonetable, name, 0, NULL,

26
lib/dns/zone.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.473 2008/04/01 01:37:25 marka Exp $ */ /* $Id: zone.c,v 1.474 2008/04/01 23:47:10 tbox Exp $ */
/*! \file */ /*! \file */
@ -2048,8 +2048,8 @@ set_signingtime(dns_zone_t *zone) {
(rdata.data[1] << 8) | rdata.data[2]); (rdata.data[1] << 8) | rdata.data[2]);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"dns_zone_signwithkey failed: %s", "dns_zone_signwithkey failed: %s",
dns_result_totext(result)); dns_result_totext(result));
} }
dns_rdata_reset(&rdata); dns_rdata_reset(&rdata);
} }
@ -3286,7 +3286,7 @@ find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
const char *directory = dns_zone_getkeydirectory(zone); const char *directory = dns_zone_getkeydirectory(zone);
CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node)); CHECK(dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node));
result = dns_dnssec_findzonekeys2(db, ver, node, dns_db_origin(db), result = dns_dnssec_findzonekeys2(db, ver, node, dns_db_origin(db),
directory, mctx, maxkeys, keys, directory, mctx, maxkeys, keys,
nkeys); nkeys);
if (result == ISC_R_NOTFOUND) if (result == ISC_R_NOTFOUND)
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;
@ -3298,7 +3298,7 @@ find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
static isc_result_t static isc_result_t
offline(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_name_t *name, offline(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, dns_name_t *name,
dns_ttl_t ttl, dns_rdata_t *rdata) dns_ttl_t ttl, dns_rdata_t *rdata)
{ {
isc_result_t result; isc_result_t result;
@ -3616,8 +3616,8 @@ zone_resigninc(dns_zone_t *zone) {
zone_keys, nkeys, now); zone_keys, nkeys, now);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"zone_resigninc:del_sigs -> %s\n", "zone_resigninc:del_sigs -> %s\n",
dns_result_totext(result)); dns_result_totext(result));
break; break;
} }
result = add_sigs(db, version, name, covers, &sig_diff, result = add_sigs(db, version, name, covers, &sig_diff,
@ -3625,8 +3625,8 @@ zone_resigninc(dns_zone_t *zone) {
expire, check_ksk); expire, check_ksk);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"zone_resigninc:add_sigs -> %s\n", "zone_resigninc:add_sigs -> %s\n",
dns_result_totext(result)); dns_result_totext(result));
break; break;
} }
result = dns_db_getsigningtime(db, &rdataset, result = dns_db_getsigningtime(db, &rdataset,
@ -3768,10 +3768,10 @@ next_active(dns_db_t *db, dns_dbversion_t *version, dns_name_t *oldname,
static void static void
set_bit(unsigned char *array, unsigned int index) { set_bit(unsigned char *array, unsigned int index) {
unsigned int shift, mask; unsigned int shift, mask;
shift = 7 - (index % 8); shift = 7 - (index % 8);
mask = 1 << shift; mask = 1 << shift;
array[index / 8] |= mask; array[index / 8] |= mask;
} }
@ -4245,7 +4245,7 @@ fprintf(stderr, "zone_sign\n");
break; break;
} else if (result != ISC_R_SUCCESS) { } else if (result != ISC_R_SUCCESS) {
dns_zone_log(zone, ISC_LOG_ERROR, dns_zone_log(zone, ISC_LOG_ERROR,
"zone_sign:dns_dbiterator_next -> %s\n", "zone_sign:dns_dbiterator_next -> %s\n",
dns_result_totext(result)); dns_result_totext(result));
goto failure; goto failure;
} else if (delegation) { } else if (delegation) {