From: Automatic Updater Date: Fri, 2 Sep 2011 23:46:33 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.9.0a2~1^2~49 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ca894e53b544de8df0084f2d9d948770a2556ae1;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/bin/named/query.c b/bin/named/query.c index 08083ff2312..0a58d8b64c6 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.368 2011/09/02 21:55:16 each Exp $ */ +/* $Id: query.c,v 1.369 2011/09/02 23:46:31 tbox Exp $ */ /*! \file */ @@ -6480,7 +6480,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) dns_message_puttempname(client->message, &fname); if (n == 0) { - /* + /* * No matching rdatasets found in cache. If we were * searching for RRSIG/SIG, that's probably okay; * otherwise this is an error condition. @@ -6491,7 +6491,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) if (!is_zone) { authoritative = ISC_FALSE; dns_rdatasetiter_destroy(&rdsiter); - client->attributes &= ~NS_CLIENTATTR_RA; + client->attributes &= ~NS_CLIENTATTR_RA; goto addauth; } @@ -6511,7 +6511,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) dns_rdatasetiter_destroy(&rdsiter); fname = query_newname(client, dbuf, &b); goto nxrrset_rrsig; - } else + } else result = DNS_R_SERVFAIL; } diff --git a/bin/tests/startperf/clean.sh b/bin/tests/startperf/clean.sh index 8732ddb5048..e32e9a5600f 100644 --- a/bin/tests/startperf/clean.sh +++ b/bin/tests/startperf/clean.sh @@ -1,3 +1,20 @@ #!/bin/sh +# +# 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 +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# 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: clean.sh,v 1.3 2011/09/02 23:46:31 tbox Exp $ + rm -rf zones rm -f named.conf diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh index 5ab27528f8e..1ae5996c3aa 100644 --- a/bin/tests/system/upforwd/setup.sh +++ b/bin/tests/system/upforwd/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 @@ -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.9 2011/09/02 02:25:07 marka Exp $ +# $Id: setup.sh,v 1.10 2011/09/02 23:46:32 tbox Exp $ cp -f ns1/example1.db ns1/example.db rm -f ns1/example.db.jnl ns2/example.bk ns2/example.bk.jnl diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h index 49bb561f0ad..f91d7e8dbe0 100644 --- a/lib/dns/include/dns/zt.h +++ b/lib/dns/include/dns/zt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-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: zt.h,v 1.39 2011/09/02 21:15:37 each Exp $ */ +/* $Id: zt.h,v 1.40 2011/09/02 23:46:32 tbox Exp $ */ #ifndef DNS_ZT_H #define DNS_ZT_H 1 diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c index a0b713be9bb..d34367200a6 100644 --- a/lib/dns/tests/dnstest.c +++ b/lib/dns/tests/dnstest.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnstest.c,v 1.5 2011/09/02 21:15:37 each Exp $ */ +/* $Id: dnstest.c,v 1.6 2011/09/02 23:46:32 tbox Exp $ */ /*! \file */ @@ -187,7 +187,7 @@ dns_test_end() { /* * Create a zone with origin 'name', return a pointer to the zone object in * 'zonep'. If 'view' is set, add the zone to that view; otherwise, create - * a new view for the purpose. + * a new view for the purpose. * * If the created view is going to be needed by the caller subsequently, * then 'keepview' should be set to true; this will prevent the view @@ -241,7 +241,7 @@ isc_result_t dns_test_setupzonemgr() { isc_result_t result; REQUIRE(zonemgr == NULL); - + result = dns_zonemgr_create(mctx, taskmgr, timermgr, socketmgr, &zonemgr); return (result); @@ -269,7 +269,7 @@ dns_test_releasezone(dns_zone_t *zone) { void dns_test_closezonemgr() { REQUIRE(zonemgr != NULL); - + dns_zonemgr_shutdown(zonemgr); dns_zonemgr_detach(&zonemgr); } diff --git a/lib/dns/tests/testdata/zt/zone1.db b/lib/dns/tests/testdata/zt/zone1.db index 16fe069b6c6..01c33369bb8 100644 --- a/lib/dns/tests/testdata/zt/zone1.db +++ b/lib/dns/tests/testdata/zt/zone1.db @@ -1,3 +1,19 @@ +; 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 +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; 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: zone1.db,v 1.3 2011/09/02 23:46:32 tbox Exp $ + $TTL 1000 @ in soa localhost. postmaster.localhost. ( 1993050801 ;serial diff --git a/lib/dns/tests/zt_test.c b/lib/dns/tests/zt_test.c index c1011edb451..3b427e296fb 100644 --- a/lib/dns/tests/zt_test.c +++ b/lib/dns/tests/zt_test.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zt_test.c,v 1.2 2011/09/02 21:15:37 each Exp $ */ +/* $Id: zt_test.c,v 1.3 2011/09/02 23:46:32 tbox Exp $ */ /*! \file */ @@ -91,7 +91,7 @@ ATF_TC_BODY(apply, tc) { result = dns_test_makezone("foo", &zone, NULL, ISC_TRUE); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); - + view = dns_zone_getview(zone); ATF_REQUIRE(view->zonetable != NULL); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 05298a5d283..c5975562577 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.629 2011/09/02 21:15:36 each Exp $ */ +/* $Id: zone.c,v 1.630 2011/09/02 23:46:32 tbox Exp $ */ /*! \file */ @@ -1654,7 +1654,7 @@ zone_asyncload(isc_task_t *task, isc_event_t *event) { LOCK_ZONE(zone); DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_LOADPENDING); UNLOCK_ZONE(zone); - + /* Inform the zone table we've finished loading */ if (asl->loaded != NULL) (asl->loaded)(asl->loaded_arg, zone, task); @@ -13528,7 +13528,7 @@ dns_zonemgr_setsize(dns_zonemgr_t *zmgr, int num_zones) { * We always set all tasks in the zone-load task pool to * privileged. This prevents other tasks in the system from * running while the server task manager is in privileged - * mode. + * mode. * * NOTE: If we start using task privileges for any other * part of the system than zone tasks, then this will need to be diff --git a/lib/dns/zt.c b/lib/dns/zt.c index 5e0d9fd708d..637e2e925ae 100644 --- a/lib/dns/zt.c +++ b/lib/dns/zt.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zt.c,v 1.51 2011/09/02 21:15:36 each Exp $ */ +/* $Id: zt.c,v 1.52 2011/09/02 23:46:32 tbox Exp $ */ /*! \file */ @@ -294,7 +294,7 @@ dns_zt_asyncload(dns_zt_t *zt, dns_zt_allloaded_t alldone, void *arg) { } /* - * Initiates asynchronous loading of zone 'zone'. 'callback' is a + * Initiates asynchronous loading of zone 'zone'. 'callback' is a * pointer to a function which will be used to inform the caller when * the zone loading is complete. */ diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h index 2e624315928..5cf611d5851 100644 --- a/lib/isc/include/isc/list.h +++ b/lib/isc/include/isc/list.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006, 2007, 2011 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1997-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: list.h,v 1.25 2011/09/02 21:15:38 each Exp $ */ +/* $Id: list.h,v 1.26 2011/09/02 23:46:33 tbox Exp $ */ #ifndef ISC_LIST_H #define ISC_LIST_H 1 diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h index fc256db8130..90c44fec41e 100644 --- a/lib/isc/include/isc/task.h +++ b/lib/isc/include/isc/task.h @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task.h,v 1.72 2011/09/02 21:15:38 each Exp $ */ +/* $Id: task.h,v 1.73 2011/09/02 23:46:33 tbox Exp $ */ #ifndef ISC_TASK_H #define ISC_TASK_H 1 @@ -626,7 +626,7 @@ void isc_task_setprivilege(isc_task_t *task, isc_boolean_t priv); /*%< * Set or unset the task's "privileged" flag depending on the value of - * 'priv'. + * 'priv'. * * Under normal circumstances this flag has no effect on the task behavior, * but when the task manager has been set to privileged exeuction mode via diff --git a/lib/isc/task.c b/lib/isc/task.c index 75df5938049..cfafb6da551 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task.c,v 1.118 2011/09/02 21:15:37 each Exp $ */ +/* $Id: task.c,v 1.119 2011/09/02 23:46:32 tbox Exp $ */ /*! \file * \author Principal Author: Bob Halley @@ -1232,7 +1232,7 @@ dispatch(isc__taskmgr_t *manager) { push_readyq(manager, task); #else ENQUEUE(new_ready_tasks, task, ready_link); - if ((task->flags & TASK_F_PRIVILEGED) != 0) + if ((task->flags & TASK_F_PRIVILEGED) != 0) ENQUEUE(new_priority_tasks, task, ready_priority_link); #endif diff --git a/lib/isc/task_api.c b/lib/isc/task_api.c index a1b53c2db3b..a53857c30ad 100644 --- a/lib/isc/task_api.c +++ b/lib/isc/task_api.c @@ -1,5 +1,5 @@ /* - * 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,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task_api.c,v 1.8 2011/09/02 21:15:38 each Exp $ */ +/* $Id: task_api.c,v 1.9 2011/09/02 23:46:32 tbox Exp $ */ #include diff --git a/lib/isc/task_p.h b/lib/isc/task_p.h index b7d463fceb1..5b417388e3c 100644 --- a/lib/isc/task_p.h +++ b/lib/isc/task_p.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 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 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task_p.h,v 1.14 2011/09/02 21:15:38 each Exp $ */ +/* $Id: task_p.h,v 1.15 2011/09/02 23:46:32 tbox Exp $ */ #ifndef ISC_TASK_P_H #define ISC_TASK_P_H diff --git a/lib/isc/tests/task_test.c b/lib/isc/tests/task_test.c index 34efe31c919..0de8129ebc3 100644 --- a/lib/isc/tests/task_test.c +++ b/lib/isc/tests/task_test.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task_test.c,v 1.2 2011/09/02 21:15:38 each Exp $ */ +/* $Id: task_test.c,v 1.3 2011/09/02 23:46:33 tbox Exp $ */ /*! \file */ @@ -114,14 +114,14 @@ ATF_TC_BODY(all_events, tc) { ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); /* First event */ - event = isc_event_allocate(mctx, task, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task, ISC_TASKEVENT_TEST, set, &a, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); ATF_CHECK_EQ(a, 0); isc_task_send(task, &event); - event = isc_event_allocate(mctx, task, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task, ISC_TASKEVENT_TEST, set, &b, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -187,7 +187,7 @@ ATF_TC_BODY(privileged_events, tc) { ATF_CHECK(!isc_task_privilege(task2)); /* First event: privileged */ - event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, set, &a, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -195,7 +195,7 @@ ATF_TC_BODY(privileged_events, tc) { isc_task_send(task1, &event); /* Second event: not privileged */ - event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, set, &b, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -203,7 +203,7 @@ ATF_TC_BODY(privileged_events, tc) { isc_task_send(task2, &event); /* Third event: privileged */ - event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, set, &c, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -211,7 +211,7 @@ ATF_TC_BODY(privileged_events, tc) { isc_task_send(task1, &event); /* Fourth event: privileged */ - event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, set, &d, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -219,7 +219,7 @@ ATF_TC_BODY(privileged_events, tc) { isc_task_send(task1, &event); /* Fifth event: not privileged */ - event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, set, &e, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -316,7 +316,7 @@ ATF_TC_BODY(privilege_drop, tc) { ATF_CHECK(!isc_task_privilege(task2)); /* First event: privileged */ - event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, set_and_drop, &a, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -324,7 +324,7 @@ ATF_TC_BODY(privilege_drop, tc) { isc_task_send(task1, &event); /* Second event: not privileged */ - event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, set_and_drop, &b, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -332,7 +332,7 @@ ATF_TC_BODY(privilege_drop, tc) { isc_task_send(task2, &event); /* Third event: privileged */ - event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, set_and_drop, &c, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -340,7 +340,7 @@ ATF_TC_BODY(privilege_drop, tc) { isc_task_send(task1, &event); /* Fourth event: privileged */ - event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task1, ISC_TASKEVENT_TEST, set_and_drop, &d, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL); @@ -348,7 +348,7 @@ ATF_TC_BODY(privilege_drop, tc) { isc_task_send(task1, &event); /* Fifth event: not privileged */ - event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, + event = isc_event_allocate(mctx, task2, ISC_TASKEVENT_TEST, set_and_drop, &e, sizeof (isc_event_t)); ATF_REQUIRE(event != NULL);