From: Automatic Updater Date: Tue, 27 Oct 2009 23:47:45 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.7.0b2^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=990dca4605f47703dfdadacb594fbafe01760661;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh index 3c14604e81e..e7a832aa2b9 100755 --- a/bin/tests/system/dlv/ns3/sign.sh +++ b/bin/tests/system/dlv/ns3/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 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 @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.5 2009/10/27 05:49:50 each Exp $ +# $Id: sign.sh,v 1.6 2009/10/27 23:47:44 tbox Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index 63b834be5d6..0f866b2249d 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 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 @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.24 2009/10/27 22:25:37 marka Exp $ +# $Id: clean.sh,v 1.25 2009/10/27 23:47:44 tbox Exp $ rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk rm -f ns1/root.db ns2/example.db ns3/secure.example.db diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in index 24be4d5b8ea..9a47023b875 100644 --- a/bin/tests/system/dnssec/ns2/example.db.in +++ b/bin/tests/system/dnssec/ns2/example.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2004, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2004, 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: example.db.in,v 1.20 2009/10/27 22:25:37 marka Exp $ +; $Id: example.db.in,v 1.21 2009/10/27 23:47:44 tbox Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf index 78b6389951f..c3f7d10de9e 100644 --- a/bin/tests/system/dnssec/ns3/named.conf +++ b/bin/tests/system/dnssec/ns3/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006-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 @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.34 2009/10/27 22:25:37 marka Exp $ */ +/* $Id: named.conf,v 1.35 2009/10/27 23:47:44 tbox Exp $ */ // NS3 diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index ff620024e67..30a9ec96b1d 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-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 @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.54 2009/10/27 22:25:37 marka Exp $ +# $Id: tests.sh,v 1.55 2009/10/27 23:47:44 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index dea074b51e2..d782d8814e5 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.34 2009/10/27 22:25:37 marka Exp $ + * $Id: opensslrsa_link.c,v 1.35 2009/10/27 23:47:45 tbox Exp $ */ #ifdef OPENSSL #include @@ -594,7 +594,7 @@ opensslrsa_verify(dst_context_t *dctx, const isc_region_t *sig) { RSA_size(rsa), rsa); break; - case DST_ALG_RSASHA256: + case DST_ALG_RSASHA256: case DST_ALG_RSASHA512: { /* @@ -612,9 +612,9 @@ opensslrsa_verify(dst_context_t *dctx, const isc_region_t *sig) { status = RSA_public_decrypt(sig->length, sig->base, original, rsa, RSA_PKCS1_PADDING); - if (status <= 0) + if (status <= 0) return (DST_R_VERIFYFAILURE); - if (status != (int)(prefixlen + digestlen)) + if (status != (int)(prefixlen + digestlen)) return (DST_R_VERIFYFAILURE); if (memcmp(original, prefix, prefixlen)) return (DST_R_VERIFYFAILURE); diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index dc01dd9e421..ee7161c77b2 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.284 2009/10/27 04:46:58 marka Exp $ */ +/* $Id: rbtdb.c,v 1.285 2009/10/27 23:47:45 tbox Exp $ */ /*! \file */ @@ -6147,7 +6147,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, newnsec = ISC_TRUE; else newnsec = ISC_FALSE; - + /* * If we're adding a delegation type, adding to the auxiliary NSEC tree, * or the DB is a cache in an overmem state, hold an exclusive lock on diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 72cb8c10025..a0e35095452 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.522 2009/10/27 22:46:13 each Exp $ */ +/* $Id: zone.c,v 1.523 2009/10/27 23:47:45 tbox Exp $ */ /*! \file */ @@ -3175,7 +3175,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) { } failure: - if (sr != NULL) + if (sr != NULL) dns_keytable_detach(&sr); if (ver != NULL) dns_db_closeversion(db, &ver, changed);