From: Automatic Updater Date: Wed, 25 Nov 2009 23:46:52 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.4.3-P1~1^9~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=521de9e5dd7710b6cdc5a2cae6f42c4eaea1e19f;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index efa09bcc80b..672230f3ff3 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004-2006, 2008 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006, 2008, 2009 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: conf.sh.in,v 1.27.18.11 2009/11/25 04:50:24 marka Exp $ +# $Id: conf.sh.in,v 1.27.18.12 2009/11/25 23:46:51 tbox Exp $ # # Common configuration data for system tests, to be sourced into diff --git a/bin/tests/system/pending/ns1/root.db.in b/bin/tests/system/pending/ns1/root.db.in index 7ebb8869af4..abd47496553 100644 --- a/bin/tests/system/pending/ns1/root.db.in +++ b/bin/tests/system/pending/ns1/root.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") +; 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 @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db.in,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $ +; $Id: root.db.in,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $ $TTL 30 . IN SOA marka.isc.org. a.root.servers.nil. ( diff --git a/bin/tests/system/pending/ns2/named.conf b/bin/tests/system/pending/ns2/named.conf index fb9b17285f3..cbfb5936ed2 100644 --- a/bin/tests/system/pending/ns2/named.conf +++ b/bin/tests/system/pending/ns2/named.conf @@ -1,6 +1,5 @@ /* - * Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2000-2002 Internet Software Consortium. + * 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 @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $ */ +/* $Id: named.conf,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $ */ // NS2 diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh index 6f743d3bc7b..62d102c7bca 100644 --- a/bin/tests/system/pending/ns2/sign.sh +++ b/bin/tests/system/pending/ns2/sign.sh @@ -1,7 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2004, 2006-2009 Internet Systems Consortium, Inc. ("ISC") -# Copyright (C) 2000-2003 Internet Software Consortium. +# 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 @@ -15,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.3.8.2 2009/11/25 20:56:08 marka Exp $ +# $Id: sign.sh,v 1.3.8.3 2009/11/25 23:46:52 tbox Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/pending/ns3/named.conf b/bin/tests/system/pending/ns3/named.conf index ddbf2a8aeb0..f4945f8b41f 100644 --- a/bin/tests/system/pending/ns3/named.conf +++ b/bin/tests/system/pending/ns3/named.conf @@ -1,6 +1,5 @@ /* - * Copyright (C) 2004, 2006-2008 Internet Systems Consortium, Inc. ("ISC") - * Copyright (C) 2000-2002 Internet Software Consortium. + * 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 @@ -15,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $ */ +/* $Id: named.conf,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $ */ // NS2 diff --git a/bin/tests/system/pending/prereq.sh b/bin/tests/system/pending/prereq.sh index b3e9b67a9ef..c9fe3ea9a7a 100644 --- a/bin/tests/system/pending/prereq.sh +++ b/bin/tests/system/pending/prereq.sh @@ -1,7 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2006, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") -# Copyright (C) 2000-2002 Internet Software Consortium. +# 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 @@ -15,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3.8.3 2009/11/25 20:56:08 marka Exp $ +# $Id: prereq.sh,v 1.3.8.4 2009/11/25 23:46:52 tbox Exp $ ../../genrandom 400 random.data if $KEYGEN -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh index d3dd8e688b0..2fff7e8d4a3 100644 --- a/bin/tests/system/pending/tests.sh +++ b/bin/tests/system/pending/tests.sh @@ -1,7 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") -# Copyright (C) 2000-2002 Internet Software Consortium. +# 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 @@ -15,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.3.8.1 2009/11/25 04:50:24 marka Exp $ +# $Id: tests.sh,v 1.3.8.2 2009/11/25 23:46:52 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 37b35ce0ac0..911cd3c5fe9 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.284.18.96 2009/11/25 04:50:25 marka Exp $ */ +/* $Id: resolver.c,v 1.284.18.97 2009/11/25 23:46:52 tbox Exp $ */ /*! \file */ @@ -4174,14 +4174,14 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adbaddrinfo_t *addrinfo, if (rdataset->trust == dns_trust_additional && sigrdataset == NULL && EXTERNAL(rdataset)) continue; - + /* - * XXXMPA: If we store as "answer" after validating - * then we need to do bailiwick processing and - * also need to track whether RRsets are in or - * out of bailiwick. This will require a another - * pending trust level. - * + * XXXMPA: If we store as "answer" after validating + * then we need to do bailiwick processing and + * also need to track whether RRsets are in or + * out of bailiwick. This will require a another + * pending trust level. + * * Cache this rdataset/sigrdataset pair as * pending data. Track whether it was additional * or not.