From 304a539c5966697827f2a021303e634aee98503d Mon Sep 17 00:00:00 2001 From: Automatic Updater Date: Thu, 13 Oct 2011 22:48:24 +0000 Subject: [PATCH] update copyright notice --- bin/named/query.c | 4 ++-- bin/tests/system/forward/ns5/named.conf | 5 ++--- bin/tests/system/forward/ns5/root.db | 5 ++--- bin/tests/system/forward/tests.sh | 4 ++-- lib/dns/include/dns/log.h | 4 ++-- lib/dns/log.c | 4 ++-- lib/dns/tests/dbversion_test.c | 28 ++++++++++++------------- 7 files changed, 26 insertions(+), 28 deletions(-) diff --git a/bin/named/query.c b/bin/named/query.c index c78a3128d0..2d6c91323f 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.374 2011/10/13 01:32:32 vjs Exp $ */ +/* $Id: query.c,v 1.375 2011/10/13 22:48:23 tbox Exp $ */ /*! \file */ @@ -5686,7 +5686,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) fname, NULL); RUNTIME_CHECK(result == ISC_R_SUCCESS); } - rpz_clean(&zone, &db, &node, NULL); + rpz_clean(&zone, &db, &node, NULL); if (rpz_st->m.rdataset != NULL) { query_putrdataset(client, &rdataset); rdataset = rpz_st->m.rdataset; diff --git a/bin/tests/system/forward/ns5/named.conf b/bin/tests/system/forward/ns5/named.conf index 90f56092b2..960a242d40 100644 --- a/bin/tests/system/forward/ns5/named.conf +++ b/bin/tests/system/forward/ns5/named.conf @@ -1,6 +1,5 @@ /* - * Copyright (C) 2004, 2007 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: named.conf,v 1.2 2011/10/12 00:18:11 marka Exp $ */ +/* $Id: named.conf,v 1.3 2011/10/13 22:48:23 tbox Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/forward/ns5/root.db b/bin/tests/system/forward/ns5/root.db index 8a60eab823..20f8d551b3 100644 --- a/bin/tests/system/forward/ns5/root.db +++ b/bin/tests/system/forward/ns5/root.db @@ -1,5 +1,4 @@ -; Copyright (C) 2004, 2007 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 @@ -13,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.2 2011/10/12 00:18:11 marka Exp $ +; $Id: root.db,v 1.3 2011/10/13 22:48:23 tbox Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index 2c47971f1f..10bb24e2e5 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 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 @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.8 2011/10/12 00:18:11 marka Exp $ +# $Id: tests.sh,v 1.9 2011/10/13 22:48:23 tbox Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index e211a48808..2060a33c6f 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001, 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: log.h,v 1.46 2011/10/13 01:32:34 vjs Exp $ */ +/* $Id: log.h,v 1.47 2011/10/13 22:48:24 tbox Exp $ */ /*! \file dns/log.h * \author Principal Authors: DCL */ diff --git a/lib/dns/log.c b/lib/dns/log.c index 001ca8c995..e6fbb53a44 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2009, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001, 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: log.c,v 1.48 2011/10/13 01:32:33 vjs Exp $ */ +/* $Id: log.c,v 1.49 2011/10/13 22:48:24 tbox Exp $ */ /*! \file */ diff --git a/lib/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c index 33d47f9c90..3b1f795d9c 100644 --- a/lib/dns/tests/dbversion_test.c +++ b/lib/dns/tests/dbversion_test.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dbversion_test.c,v 1.4 2011/10/13 13:13:52 marka Exp $ */ +/* $Id: dbversion_test.c,v 1.5 2011/10/13 22:48:24 tbox Exp $ */ /*! \file */ @@ -44,7 +44,7 @@ static char tempname[11] = "dtXXXXXXXX"; static void callback(const char *file, int line, isc_assertiontype_t type, - const char *cond) + const char *cond) { UNUSED(file); UNUSED(line); UNUSED(type); UNUSED(cond); if (strcmp(tempname, "dtXXXXXXXX")) @@ -60,12 +60,12 @@ static void setup_db() { isc_result_t result; result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone, - dns_rdataclass_in, 0, NULL, &db1); + dns_rdataclass_in, 0, NULL, &db1); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); dns_db_newversion(db1, &v1); result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone, - dns_rdataclass_in, 0, NULL, &db2); + dns_rdataclass_in, 0, NULL, &db2); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); dns_db_newversion(db2, &v2); } @@ -103,7 +103,7 @@ attachversion(isc_assertioncallback_t callback) { result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - + setup_db(); isc_assertion_setcallback(callback); @@ -126,7 +126,7 @@ ATF_TC_HEAD(attachversion, tc) { ATF_TC_BODY(attachversion, tc) { UNUSED(tc); - + attachversion(NULL); } @@ -147,7 +147,7 @@ closeversion(isc_assertioncallback_t callback) { result = dns_test_begin(NULL, ISC_FALSE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - + setup_db(); isc_assertion_setcallback(callback); @@ -203,7 +203,7 @@ find(isc_assertioncallback_t callback) { if (callback != NULL) atf_tc_fail("dns_db_find did not assert"); ATF_REQUIRE_EQ(result, DNS_R_NXDOMAIN); - + close_db(); dns_test_end(); @@ -256,7 +256,7 @@ allrdatasets(isc_assertioncallback_t callback) { dns_db_detachnode(db1, &node); ATF_REQUIRE_EQ(node, NULL); - + close_db(); dns_test_end(); @@ -311,7 +311,7 @@ findrdataset(isc_assertioncallback_t callback) { dns_db_detachnode(db1, &node); ATF_REQUIRE_EQ(node, NULL); - + close_db(); dns_test_end(); @@ -366,7 +366,7 @@ deleterdataset(isc_assertioncallback_t callback) { dns_db_detachnode(db1, &node); ATF_REQUIRE_EQ(node, NULL); - + close_db(); dns_test_end(); @@ -428,7 +428,7 @@ subtract(isc_assertioncallback_t callback) { dns_db_detachnode(db1, &node); ATF_REQUIRE_EQ(node, NULL); - + close_db(); dns_test_end(); @@ -441,7 +441,7 @@ ATF_TC_HEAD(subtractrdataset, tc) { ATF_TC_BODY(subtractrdataset, tc) { UNUSED(tc); - + subtract(NULL); } @@ -538,7 +538,7 @@ addrdataset(isc_assertioncallback_t callback) { dns_db_detachnode(db1, &node); ATF_REQUIRE_EQ(node, NULL); - + close_db(); dns_test_end();