ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch 'master' of ssh://repo/proj/git/prod/bind9

Browse Source
This commit is contained in:
Evan Hunt
2012-10-24 18:03:54 -07:00
parent 4b3d727d96 a3fb84bd1b
commit 9c659b618f
11 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/check/named-checkconf.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2007, 2009-2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
bin/tests/system/ifconfig.sh
View File

@@ -9,7 +9,7 @@
#
# 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,
# 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

2
bin/tools/genrandom.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007, 2009, 2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2009, 2010, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/dns/rbt.c
View File

@@ -537,7 +537,7 @@ serialize_nodes(FILE *file, dns_rbtnode_t *node, uintptr_t parent,
if (node->data != NULL) {
long ret;
ret = ftell(file);
if (ret < 0)
return (ISC_R_FAILURE);

2
lib/export/samples/sample-request.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2009, 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

2
lib/isc/include/isc/sockaddr.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2007, 2009, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

2
lib/isc/inet_aton.c
View File

@@ -1,5 +1,5 @@
/*
* Portions Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2004, 2005, 2007, 2008, 2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1996-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

16
lib/isc/ratelimiter.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2002 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -114,7 +114,7 @@ isc_ratelimiter_setinterval(isc_ratelimiter_t *rl, isc_interval_t *interval) {
/*
* If the timer is currently running, change its rate.
*/
if (rl->state == isc_ratelimiter_ratelimited) {
if (rl->state == isc_ratelimiter_ratelimited) {
result = isc_timer_reset(rl->timer, isc_timertype_ticker, NULL,
&rl->interval, ISC_FALSE);
}
@@ -142,13 +142,13 @@ isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task,
REQUIRE(ev->ev_sender == NULL);
LOCK(&rl->lock);
if (rl->state == isc_ratelimiter_ratelimited ||
if (rl->state == isc_ratelimiter_ratelimited ||
rl->state == isc_ratelimiter_stalled) {
isc_event_t *ev = *eventp;
ev->ev_sender = task;
ISC_LIST_APPEND(rl->pending, ev, ev_link);
ISC_LIST_APPEND(rl->pending, ev, ev_link);
*eventp = NULL;
} else if (rl->state == isc_ratelimiter_idle) {
} else if (rl->state == isc_ratelimiter_idle) {
result = isc_timer_reset(rl->timer, isc_timertype_ticker, NULL,
&rl->interval, ISC_FALSE);
if (result == ISC_R_SUCCESS) {
@@ -177,7 +177,7 @@ ratelimiter_tick(isc_task_t *task, isc_event_t *event) {
isc_event_free(&event);
pertic = rl->pertic;
while (pertic != 0) {
while (pertic != 0) {
pertic--;
LOCK(&rl->lock);
p = ISC_LIST_HEAD(rl->pending);
@@ -289,7 +289,7 @@ isc_ratelimiter_stall(isc_ratelimiter_t *rl) {
break;
case isc_ratelimiter_ratelimited:
result = isc_timer_reset(rl->timer, isc_timertype_inactive,
NULL, NULL, ISC_FALSE);
NULL, NULL, ISC_FALSE);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
/* FALLTHROUGH */
case isc_ratelimiter_idle:
@@ -317,7 +317,7 @@ isc_ratelimiter_release(isc_ratelimiter_t *rl) {
&rl->interval, ISC_FALSE);
if (result == ISC_R_SUCCESS)
rl->state = isc_ratelimiter_ratelimited;
} else
} else
rl->state = isc_ratelimiter_idle;
break;
case isc_ratelimiter_ratelimited:

2
lib/lwres/context.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007-2009 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007-2009, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

4
lib/lwres/lwinetaton.c
View File

@@ -1,5 +1,5 @@
/*
* Portions Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 2004, 2005, 2007, 2012 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1996-2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -120,7 +120,7 @@ lwres_net_aton(const char *cp, struct in_addr *addr) {
c = *++cp;
if (c == 'x' || c == 'X') {
base = 16;
c = *++cp;
c = *++cp;
} else {
base = 8;
digit = 1;

17
util/copyrights
View File

@@ -16,7 +16,7 @@
./bin/check/check-tool.c C 2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
./bin/check/check-tool.h C 2000,2001,2002,2004,2005,2007,2010,2011
./bin/check/named-checkconf.8 MAN DOCBOOK
./bin/check/named-checkconf.c C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011
./bin/check/named-checkconf.c C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012
./bin/check/named-checkconf.docbook SGML 2000,2001,2002,2004,2005,2007,2009
./bin/check/named-checkconf.html HTML DOCBOOK
./bin/check/named-checkzone.8 MAN DOCBOOK
@@ -1544,7 +1544,7 @@
./bin/tools/arpaname.docbook SGML 2009
./bin/tools/arpaname.html HTML DOCBOOK
./bin/tools/genrandom.8 MAN DOCBOOK
./bin/tools/genrandom.c C 2000,2001,2002,2003,2004,2005,2007,2009,2010
./bin/tools/genrandom.c C 2000,2001,2002,2003,2004,2005,2007,2009,2010,2012
./bin/tools/genrandom.docbook SGML 2009,2010,2011
./bin/tools/genrandom.html HTML DOCBOOK
./bin/tools/isc-hmac-fixup.8 MAN DOCBOOK
@@ -2575,7 +2575,7 @@
./lib/export/samples/nsprobe.c C 2009,2010,2011,2012
./lib/export/samples/sample-async.c C 2009
./lib/export/samples/sample-gai.c C 2009,2012
./lib/export/samples/sample-request.c C 2009
./lib/export/samples/sample-request.c C 2009,2012
./lib/export/samples/sample-update.c C 2009,2010,2012
./lib/export/samples/sample.c C 2009,2012
./lib/irs/Makefile.in MAKE 2009,2012
@@ -2691,7 +2691,7 @@
./lib/isc/include/isc/serial.h C 1999,2000,2001,2004,2005,2006,2007,2009
./lib/isc/include/isc/sha1.h C 2000,2001,2004,2005,2006,2007,2009
./lib/isc/include/isc/sha2.h C 2005,2006,2007,2009
./lib/isc/include/isc/sockaddr.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009
./lib/isc/include/isc/sockaddr.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012
./lib/isc/include/isc/socket.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012
./lib/isc/include/isc/stats.h C 2009,2012
./lib/isc/include/isc/stdio.h C 2000,2001,2004,2005,2006,2007
@@ -2705,7 +2705,7 @@
./lib/isc/include/isc/util.h C 1998,1999,2000,2001,2004,2005,2006,2007,2010,2011,2012
./lib/isc/include/isc/version.h C 2001,2004,2005,2006,2007
./lib/isc/include/isc/xml.h C 2006,2007
./lib/isc/inet_aton.c C.PORTION 1996,1997,1998,1999,2000,2001,2004,2005,2007,2008
./lib/isc/inet_aton.c C.PORTION 1996,1997,1998,1999,2000,2001,2004,2005,2007,2008,2012
./lib/isc/inet_ntop.c C 1996,1997,1998,1999,2000,2001,2004,2005,2007,2009
./lib/isc/inet_pton.c C 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2007
./lib/isc/iterated_hash.c C 2006,2008,2009
@@ -2760,7 +2760,7 @@
./lib/isc/quota.c C 2000,2001,2004,2005,2007
./lib/isc/radix.c C 2007,2008,2009,2011,2012
./lib/isc/random.c C 1999,2000,2001,2002,2003,2004,2005,2007,2009
./lib/isc/ratelimiter.c C 1999,2000,2001,2002,2004,2005,2007
./lib/isc/ratelimiter.c C 1999,2000,2001,2002,2004,2005,2007,2012
./lib/isc/refcount.c C 2005,2007
./lib/isc/region.c C 2002,2004,2005,2007
./lib/isc/result.c C 1998,1999,2000,2001,2003,2004,2005,2007,2008,2012
@@ -2789,6 +2789,7 @@
./lib/isc/tests/isctest.h C 2011,2012
./lib/isc/tests/parse_test.c C 2012
./lib/isc/tests/queue_test.c C 2011,2012
./lib/isc/tests/sockaddr_test.c C 2012
./lib/isc/tests/socket_test.c C 2011,2012
./lib/isc/tests/symtab_test.c C 2011,2012
./lib/isc/tests/task_test.c C 2011,2012
@@ -2960,7 +2961,7 @@
./lib/lwres/Makefile.in MAKE 2000,2001,2004,2005,2007,2012
./lib/lwres/api X 2000,2001,2006,2008,2009,2010,2011,2012
./lib/lwres/assert_p.h C 2000,2001,2004,2005,2007,2011,2012
./lib/lwres/context.c C 2000,2001,2003,2004,2005,2007,2008,2009
./lib/lwres/context.c C 2000,2001,2003,2004,2005,2007,2008,2009,2012
./lib/lwres/context_p.h C 2000,2001,2004,2005,2007,2008
./lib/lwres/gai_strerror.c C 2000,2001,2004,2005,2006,2007
./lib/lwres/getaddrinfo.c C.BSDI 1999,2000,2001,2004,2005,2006,2007,2008,2012
@@ -2986,7 +2987,7 @@
./lib/lwres/include/lwres/version.h C 2001,2004,2005,2006,2007
./lib/lwres/lwbuffer.c C 2000,2001,2004,2005,2007
./lib/lwres/lwconfig.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2012
./lib/lwres/lwinetaton.c C.PORTION 1996,1997,1998,1999,2000,2001,2003,2004,2005,2007
./lib/lwres/lwinetaton.c C.PORTION 1996,1997,1998,1999,2000,2001,2003,2004,2005,2007,2012
./lib/lwres/lwinetntop.c C 1996,1997,1998,1999,2000,2001,2003,2004,2005,2007
./lib/lwres/lwinetpton.c C 1996,1997,1998,1999,2000,2001,2004,2005,2007,2011,2012
./lib/lwres/lwpacket.c C 2000,2001,2004,2005,2007