From 1da9dbcf48dcfc5c1589def3e785844935d1882c Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Tue, 4 Jan 2011 23:47:14 +0000 Subject: [PATCH] update copyright notice --- COPYRIGHT | 4 ++-- bin/named/bindkeys.pl | 6 +++--- bin/named/server.c | 6 +++--- bin/tests/system/dnssec/README | 4 ++-- bin/tests/system/dnssec/clean.sh | 4 ++-- bin/tests/system/dnssec/ns1/sign.sh | 4 ++-- bin/tests/system/dnssec/ns4/named1.conf | 5 ++--- bin/tests/system/dnssec/ns4/named2.conf | 5 ++--- bin/tests/system/dnssec/setup.sh | 4 ++-- bin/tests/system/dnssec/tests.sh | 4 ++-- doc/arm/Bv9ARM-book.xml | 5 +++-- lib/isc/pthreads/mutex.c | 4 ++-- lib/isccfg/include/isccfg/grammar.h | 4 ++-- lib/isccfg/namedconf.c | 4 ++-- lib/isccfg/parser.c | 4 ++-- 15 files changed, 33 insertions(+), 34 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 855b960290..0329924433 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,4 +1,4 @@ -Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 1996-2003 Internet Software Consortium. Permission to use, copy, modify, and/or distribute this software for any @@ -13,7 +13,7 @@ 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: COPYRIGHT,v 1.16 2010/01/04 23:48:51 tbox Exp $ +$Id: COPYRIGHT,v 1.17 2011/01/04 23:47:13 tbox Exp $ Portions Copyright (C) 1996-2001 Nominum, Inc. diff --git a/bin/named/bindkeys.pl b/bin/named/bindkeys.pl index 4a3677e0c1..981c02b367 100755 --- a/bin/named/bindkeys.pl +++ b/bin/named/bindkeys.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# Copyright (C) 2009, 2010 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009-2011 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,12 +14,12 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: bindkeys.pl,v 1.6 2011/01/03 23:45:07 each Exp $ +# $Id: bindkeys.pl,v 1.7 2011/01/04 23:47:13 tbox Exp $ use strict; use warnings; -my $rev = '$Id: bindkeys.pl,v 1.6 2011/01/03 23:45:07 each Exp $'; +my $rev = '$Id: bindkeys.pl,v 1.7 2011/01/04 23:47:13 tbox Exp $'; $rev =~ s/\$//g; $rev =~ s/,v//g; $rev =~ s/Id: //; diff --git a/bin/named/server.c b/bin/named/server.c index ecf4a77dfc..3105607939 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2011 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: server.c,v 1.592 2011/01/03 23:45:07 each Exp $ */ +/* $Id: server.c,v 1.593 2011/01/04 23:47:13 tbox Exp $ */ /*! \file */ @@ -635,7 +635,7 @@ load_view_keys(const cfg_obj_t *keys, const cfg_obj_t *vconfig, * If keyname was specified, we only add that key. */ if (keyname != NULL && - !dns_name_equal(keyname, dst_key_name(dstkey))) + !dns_name_equal(keyname, dst_key_name(dstkey))) { dst_key_free(&dstkey); continue; diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README index 5c419872fc..4c0598c005 100644 --- a/bin/tests/system/dnssec/README +++ b/bin/tests/system/dnssec/README @@ -1,8 +1,8 @@ -Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +Copyright (C) 2004, 2011 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 2000-2002 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. -$Id: README,v 1.9 2011/01/03 23:45:07 each Exp $ +$Id: README,v 1.10 2011/01/04 23:47:13 tbox Exp $ The test setup for the DNSSEC tests has a secure root. diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index 08a191f0c0..01eb2c2b73 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-2010 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007-2011 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.32 2011/01/03 23:45:07 each Exp $ +# $Id: clean.sh,v 1.33 2011/01/04 23:47:13 tbox Exp $ rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed rm -f */trusted.conf */managed.conf */tmp* */*.jnl */*.bk diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh index f82b3b9edd..37d4bfcd20 100644 --- a/bin/tests/system/dnssec/ns1/sign.sh +++ b/bin/tests/system/dnssec/ns1/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2006-2010 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006-2011 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 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: sign.sh,v 1.35 2011/01/03 23:45:07 each Exp $ +# $Id: sign.sh,v 1.36 2011/01/04 23:47:13 tbox Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/dnssec/ns4/named1.conf b/bin/tests/system/dnssec/ns4/named1.conf index b05741c8be..c4a220903b 100644 --- a/bin/tests/system/dnssec/ns4/named1.conf +++ b/bin/tests/system/dnssec/ns4/named1.conf @@ -1,6 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2000, 2001 Internet Software Consortium. + * Copyright (C) 2011 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 @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.2 2011/01/03 23:45:08 each Exp $ */ +/* $Id: named1.conf,v 1.3 2011/01/04 23:47:13 tbox Exp $ */ // NS4 diff --git a/bin/tests/system/dnssec/ns4/named2.conf b/bin/tests/system/dnssec/ns4/named2.conf index 013dfaf504..cc395bed78 100644 --- a/bin/tests/system/dnssec/ns4/named2.conf +++ b/bin/tests/system/dnssec/ns4/named2.conf @@ -1,6 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2000, 2001 Internet Software Consortium. + * Copyright (C) 2011 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 @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named2.conf,v 1.2 2011/01/03 23:45:08 each Exp $ */ +/* $Id: named2.conf,v 1.3 2011/01/04 23:47:13 tbox Exp $ */ // NS4 diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index ad9f4aeac0..d7bb493b62 100644 --- a/bin/tests/system/dnssec/setup.sh +++ b/bin/tests/system/dnssec/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009, 2011 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 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.18 2011/01/03 23:45:07 each Exp $ +# $Id: setup.sh,v 1.19 2011/01/04 23:47:13 tbox Exp $ ../../../tools/genrandom 400 random.data diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index 76efc7e4f6..f9129f9fbf 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2011 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.72 2011/01/03 23:45:07 each Exp $ +# $Id: tests.sh,v 1.73 2011/01/04 23:47:13 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 4a47b9903c..7c792a0209 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -2,7 +2,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" []> - + BIND 9 Administrator Reference Manual @@ -31,6 +31,7 @@ 2008 2009 2010 + 2011 Internet Systems Consortium, Inc. ("ISC") diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c index 34c7b435bc..ba04f1671e 100644 --- a/lib/isc/pthreads/mutex.c +++ b/lib/isc/pthreads/mutex.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008, 2011 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: mutex.c,v 1.17 2011/01/04 04:32:13 marka Exp $ */ +/* $Id: mutex.c,v 1.18 2011/01/04 23:47:14 tbox Exp $ */ /*! \file */ diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index 33b97a1db4..2d7080c24c 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002, 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: grammar.h,v 1.23 2011/01/03 23:45:08 each Exp $ */ +/* $Id: grammar.h,v 1.24 2011/01/04 23:47:14 tbox Exp $ */ #ifndef ISCCFG_GRAMMAR_H #define ISCCFG_GRAMMAR_H 1 diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 92d3ba36bc..a1cec5a69e 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2002, 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: namedconf.c,v 1.127 2011/01/03 23:45:08 each Exp $ */ +/* $Id: namedconf.c,v 1.128 2011/01/04 23:47:14 tbox Exp $ */ /*! \file */ diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index f3c48c8503..7db753e2cb 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-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: parser.c,v 1.138 2011/01/03 23:45:08 each Exp $ */ +/* $Id: parser.c,v 1.139 2011/01/04 23:47:14 tbox Exp $ */ /*! \file */