From c6fb85f9500350e5ce58c9a24f5d264c8a8bd6f4 Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Wed, 1 Jul 2009 23:47:36 +0000 Subject: [PATCH] update copyright notice --- bin/dnssec/Makefile.in | 4 ++-- bin/dnssec/dnssec-revoke.8 | 12 ++++++------ bin/dnssec/dnssec-revoke.html | 13 +++++++------ doc/arm/man.dnssec-revoke.html | 14 +++++++------- lib/dns/Makefile.in | 4 ++-- lib/dns/include/dns/keytable.h | 14 +++++++------- lib/dns/include/dns/master.h | 4 ++-- lib/dns/include/dns/soa.h | 8 ++++---- lib/dns/keydata.c | 4 ++-- lib/dns/keytable.c | 16 ++++++++-------- lib/dns/soa.c | 8 ++++---- lib/isc/random.c | 6 +++--- 12 files changed, 54 insertions(+), 53 deletions(-) diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index 81c4725f98..9207281106 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # 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 # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.36 2009/06/30 02:52:32 each Exp $ +# $Id: Makefile.in,v 1.37 2009/07/01 23:47:36 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/dnssec/dnssec-revoke.8 b/bin/dnssec/dnssec-revoke.8 index 3277fe3ddc..9f8b19e1dc 100644 --- a/bin/dnssec/dnssec-revoke.8 +++ b/bin/dnssec/dnssec-revoke.8 @@ -1,18 +1,18 @@ -.\" Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" Permission to use, copy, modify, and distribute this software for any +.\" Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") +.\" +.\" Permission to use, copy, modify, and/or distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH .\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, .\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM .\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: dnssec-revoke.8,v 1.3 2009/06/30 03:32:58 tbox Exp $ +.\" $Id: dnssec-revoke.8,v 1.4 2009/07/01 23:47:36 tbox Exp $ .\" .hy 0 .ad l diff --git a/bin/dnssec/dnssec-revoke.html b/bin/dnssec/dnssec-revoke.html index 1d5f76e8d3..4f22d53f13 100644 --- a/bin/dnssec/dnssec-revoke.html +++ b/bin/dnssec/dnssec-revoke.html @@ -1,19 +1,20 @@ - + + diff --git a/doc/arm/man.dnssec-revoke.html b/doc/arm/man.dnssec-revoke.html index da0962985c..9422ae6bb7 100644 --- a/doc/arm/man.dnssec-revoke.html +++ b/doc/arm/man.dnssec-revoke.html @@ -1,20 +1,20 @@ - + + diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index b8164657ed..170031fb1c 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # 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 # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.164 2009/06/30 02:52:32 each Exp $ +# $Id: Makefile.in,v 1.165 2009/07/01 23:47:36 tbox Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h index 2212fd08a3..97f8bbe9b0 100644 --- a/lib/dns/include/dns/keytable.h +++ b/lib/dns/include/dns/keytable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keytable.h,v 1.17 2009/06/30 02:52:32 each Exp $ */ +/* $Id: keytable.h,v 1.18 2009/07/01 23:47:36 tbox Exp $ */ #ifndef DNS_KEYTABLE_H #define DNS_KEYTABLE_H 1 @@ -170,7 +170,7 @@ dns_keytable_add(dns_keytable_t *keytable, isc_boolean_t managed, isc_result_t dns_keytable_marksecure(dns_keytable_t *keytable, dns_name_t *name); /*%< - * Add a null key to 'keytable' for name 'name'. This marks the + * Add a null key to 'keytable' for name 'name'. This marks the * name as a secure domain, but doesn't supply any key data to allow the * domain to be validated. (Used when automated trust anchor management * has gotten broken by a zone misconfiguration; for exmaple, when the @@ -200,7 +200,7 @@ isc_result_t dns_keytable_delete(dns_keytable_t *keytable, dns_name_t *keyname); /*%< * Delete node(s) from 'keytable' matching name 'keyname' - * + * * Requires: * *\li 'keytable' points to a valid keytable. @@ -219,11 +219,11 @@ dns_keytable_deletekeynode(dns_keytable_t *keytable, dst_key_t *dstkey); /*%< * Delete node(s) from 'keytable' containing copies of the key pointed * to by 'dstkey' - * + * * Requires: * *\li 'keytable' points to a valid keytable. - *\li 'dstkey' is not NULL + *\li 'dstkey' is not NULL * * Returns: * @@ -307,7 +307,7 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name, isc_result_t dns_keytable_findnextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode, - dns_keynode_t **nextnodep); + dns_keynode_t **nextnodep); /*%< * Search for the next key with the same properties as 'keynode' in * 'keytable' as found by dns_keytable_findkeynode(). diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h index 74888a7f42..41560ee4b2 100644 --- a/lib/dns/include/dns/master.h +++ b/lib/dns/include/dns/master.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: master.h,v 1.52 2009/06/30 02:52:32 each Exp $ */ +/* $Id: master.h,v 1.53 2009/07/01 23:47:36 tbox Exp $ */ #ifndef DNS_MASTER_H #define DNS_MASTER_H 1 diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h index a57939a24f..81425d46c6 100644 --- a/lib/dns/include/dns/soa.h +++ b/lib/dns/include/dns/soa.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa.h,v 1.10 2009/06/30 02:52:32 each Exp $ */ +/* $Id: soa.h,v 1.11 2009/07/01 23:47:36 tbox Exp $ */ #ifndef DNS_SOA_H #define DNS_SOA_H 1 @@ -43,8 +43,8 @@ ISC_LANG_BEGINDECLS isc_result_t dns_soa_buildrdata(dns_name_t *origin, dns_name_t *contact, dns_rdataclass_t rdclass, - isc_uint32_t serial, isc_uint32_t refresh, - isc_uint32_t retry, isc_uint32_t expire, + isc_uint32_t serial, isc_uint32_t refresh, + isc_uint32_t retry, isc_uint32_t expire, isc_uint32_t minimum, dns_rdata_t *rdata); isc_uint32_t dns_soa_getserial(dns_rdata_t *rdata); diff --git a/lib/dns/keydata.c b/lib/dns/keydata.c index 588e31e1a1..822bd467dc 100644 --- a/lib/dns/keydata.c +++ b/lib/dns/keydata.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keydata.c,v 1.2 2009/06/30 02:52:32 each Exp $ */ +/* $Id: keydata.c,v 1.3 2009/07/01 23:47:36 tbox Exp $ */ /*! \file */ @@ -76,7 +76,7 @@ dns_keydata_fromdnskey(dns_rdata_keydata_t *keydata, keydata->algorithm = dnskey->algorithm; keydata->datalen = dnskey->datalen; - if (mctx == NULL) + if (mctx == NULL) keydata->data = dnskey->data; else { keydata->data = isc_mem_allocate(mctx, keydata->datalen); diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c index 32cc494dac..df5a430a17 100644 --- a/lib/dns/keytable.c +++ b/lib/dns/keytable.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keytable.c,v 1.35 2009/06/30 02:52:32 each Exp $ */ +/* $Id: keytable.c,v 1.36 2009/07/01 23:47:36 tbox Exp $ */ /*! \file */ @@ -206,7 +206,7 @@ insert(dns_keytable_t *keytable, isc_boolean_t managed, isc_result_t dns_keytable_add(dns_keytable_t *keytable, isc_boolean_t managed, dst_key_t **keyp) -{ +{ REQUIRE(keyp != NULL && *keyp != NULL); return (insert(keytable, managed, dst_key_name(*keyp), keyp)); } @@ -223,7 +223,7 @@ dns_keytable_delete(dns_keytable_t *keytable, dns_name_t *keyname) { REQUIRE(VALID_KEYTABLE(keytable)); REQUIRE(keyname != NULL); - + RWLOCK(&keytable->rwlock, isc_rwlocktype_write); result = dns_rbt_findnode(keytable->table, keyname, NULL, &node, NULL, DNS_RBTFIND_NOOPTIONS, NULL, NULL); @@ -267,16 +267,16 @@ dns_keytable_deletekeynode(dns_keytable_t *keytable, dst_key_t *dstkey) { } knode = node->data; - if (knode->next == NULL && + if (knode->next == NULL && (knode->key == NULL || dst_key_compare(knode->key, dstkey) == ISC_TRUE)) { result = dns_rbt_deletenode(keytable->table, node, ISC_FALSE); goto finish; } - + kprev = (dns_keynode_t **) &node->data; while (knode != NULL) { - if (dst_key_compare(knode->key, dstkey) == ISC_TRUE) + if (dst_key_compare(knode->key, dstkey) == ISC_TRUE) break; kprev = &knode; knode = knode->next; @@ -312,7 +312,7 @@ dns_keytable_find(dns_keytable_t *keytable, dns_name_t *keyname, REQUIRE(VALID_KEYTABLE(keytable)); REQUIRE(keyname != NULL); REQUIRE(keynodep != NULL && *keynodep == NULL); - + RWLOCK(&keytable->rwlock, isc_rwlocktype_read); result = dns_rbt_findnode(keytable->table, keyname, NULL, &node, NULL, DNS_RBTFIND_NOOPTIONS, NULL, NULL); diff --git a/lib/dns/soa.c b/lib/dns/soa.c index c974d15d35..a68d0aa92f 100644 --- a/lib/dns/soa.c +++ b/lib/dns/soa.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa.c,v 1.9 2009/06/30 02:52:32 each Exp $ */ +/* $Id: soa.c,v 1.10 2009/07/01 23:47:36 tbox Exp $ */ /*! \file */ @@ -65,8 +65,8 @@ soa_get(dns_rdata_t *rdata, int offset) { isc_result_t dns_soa_buildrdata(dns_name_t *origin, dns_name_t *contact, dns_rdataclass_t rdclass, - isc_uint32_t serial, isc_uint32_t refresh, - isc_uint32_t retry, isc_uint32_t expire, + isc_uint32_t serial, isc_uint32_t refresh, + isc_uint32_t retry, isc_uint32_t expire, isc_uint32_t minimum, dns_rdata_t *rdata) { dns_rdata_soa_t soa; char soadata[DNS_NAME_FORMATSIZE]; diff --git a/lib/isc/random.c b/lib/isc/random.c index 905697cc9f..dda4a2dbd6 100644 --- a/lib/isc/random.c +++ b/lib/isc/random.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: random.c,v 1.26 2009/06/30 02:52:32 each Exp $ */ +/* $Id: random.c,v 1.27 2009/07/01 23:47:36 tbox Exp $ */ /*! \file */ @@ -43,7 +43,7 @@ initialize_rand(void) { #ifndef HAVE_ARC4RANDOM unsigned int pid = getpid(); - + /* * The low bits of pid generally change faster. * Xor them with the high bits of time which change slowly.