From 3d264c70a3ccf45b11dc1ed5dbcd04a36fe8deda Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Thu, 9 Feb 2012 23:45:25 +0000 Subject: [PATCH] update copyright notice --- bin/tests/system/resolver/clean.sh | 4 ++-- bin/tests/system/resolver/ns4/named.conf | 4 ++-- bin/tests/system/resolver/ns4/tld1.db | 4 ++-- bin/tests/system/resolver/ns4/tld2.db | 4 ++-- bin/tests/system/resolver/ns6/named.conf | 4 ++-- bin/tests/system/resolver/ns6/to-be-removed.tld.db.in | 4 ++-- bin/tests/system/resolver/setup.sh | 4 ++-- bin/tests/system/resolver/tests.sh | 4 ++-- lib/dns/rbtdb.c | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh index d3c951855d..516bfbffbe 100644 --- a/bin/tests/system/resolver/clean.sh +++ b/bin/tests/system/resolver/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008, 2010, 2011 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2008, 2010-2012 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: clean.sh,v 1.1.84.7 2012/02/09 21:05:29 marka Exp $ +# $Id: clean.sh,v 1.1.84.8 2012/02/09 23:45:25 tbox Exp $ # # Clean up after resolver tests. diff --git a/bin/tests/system/resolver/ns4/named.conf b/bin/tests/system/resolver/ns4/named.conf index 858297dcb6..ba89edadfa 100644 --- a/bin/tests/system/resolver/ns4/named.conf +++ b/bin/tests/system/resolver/ns4/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2010-2012 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 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.6.5 2012/02/09 21:05:29 marka Exp $ */ +/* $Id: named.conf,v 1.2.6.6 2012/02/09 23:45:25 tbox Exp $ */ // NS4 diff --git a/bin/tests/system/resolver/ns4/tld1.db b/bin/tests/system/resolver/ns4/tld1.db index 71ce80e3c8..f3ee99521c 100644 --- a/bin/tests/system/resolver/ns4/tld1.db +++ b/bin/tests/system/resolver/ns4/tld1.db @@ -1,4 +1,4 @@ -; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2012 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: tld1.db,v 1.2.8.2 2012/02/09 21:05:29 marka Exp $ +; $Id: tld1.db,v 1.2.8.3 2012/02/09 23:45:25 tbox Exp $ $TTL 300 @ IN SOA marka.isc.org. ns.server. ( diff --git a/bin/tests/system/resolver/ns4/tld2.db b/bin/tests/system/resolver/ns4/tld2.db index 7b0cb5605a..b4eb47dd6f 100644 --- a/bin/tests/system/resolver/ns4/tld2.db +++ b/bin/tests/system/resolver/ns4/tld2.db @@ -1,4 +1,4 @@ -; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2012 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: tld2.db,v 1.2.8.2 2012/02/09 21:05:29 marka Exp $ +; $Id: tld2.db,v 1.2.8.3 2012/02/09 23:45:25 tbox Exp $ $TTL 300 @ IN SOA marka.isc.org. ns.server. ( diff --git a/bin/tests/system/resolver/ns6/named.conf b/bin/tests/system/resolver/ns6/named.conf index 1017e45d49..36a1b45ae0 100644 --- a/bin/tests/system/resolver/ns6/named.conf +++ b/bin/tests/system/resolver/ns6/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2010, 2012 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 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.6.3 2012/02/09 21:05:29 marka Exp $ */ +/* $Id: named.conf,v 1.2.6.4 2012/02/09 23:45:25 tbox Exp $ */ // NS4 diff --git a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in index 761ffe14c6..4910de5872 100644 --- a/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in +++ b/bin/tests/system/resolver/ns6/to-be-removed.tld.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2010 Internet Systems Consortium, Inc. ("ISC") +; Copyright (C) 2012 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: to-be-removed.tld.db.in,v 1.2.8.2 2012/02/09 21:05:29 marka Exp $ +; $Id: to-be-removed.tld.db.in,v 1.2.8.3 2012/02/09 23:45:25 tbox Exp $ $TTL 600 @ IN SOA ns hostmaster 1 1800 900 604800 600 diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh index 1327550230..ebc513da48 100644 --- a/bin/tests/system/resolver/setup.sh +++ b/bin/tests/system/resolver/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# Copyright (C) 2010, 2011 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2010-2012 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: setup.sh,v 1.2.6.7 2012/02/09 21:05:29 marka Exp $ +# $Id: setup.sh,v 1.2.6.8 2012/02/09 23:45:25 tbox Exp $ ../../genrandom 400 random.data diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index f9b8221d95..b2e80705b4 100644 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2007, 2010, 2011 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2010-2012 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: tests.sh,v 1.9.332.10 2012/02/09 21:05:29 marka Exp $ +# $Id: tests.sh,v 1.9.332.11 2012/02/09 23:45:25 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index 5019abcdea..64b27b0fec 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.270.12.42 2012/02/09 21:05:29 marka Exp $ */ +/* $Id: rbtdb.c,v 1.270.12.43 2012/02/09 23:45:25 tbox Exp $ */ /*! \file */ @@ -5739,7 +5739,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion, * If we have will be replacing a NS RRset force its TTL * to be no more than the current NS RRset's TTL. This * ensures the delegations that are withdrawn are honoured. - */ + */ if (IS_CACHE(rbtdb) && header->rdh_ttl > now && header->type == dns_rdatatype_ns && !header_nx && !newheader_nx &&