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

This commit is contained in:
Evan Hunt 2013-02-21 18:16:43 -08:00
commit 1b197a7adb
22 changed files with 46 additions and 43 deletions

View file

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

View file

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

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2013 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2001-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@ -1801,7 +1801,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
obj = NULL;
res1 = cfg_map_get(zoptions, "inline-signing", &obj);
if ((tresult != ISC_R_SUCCESS &&
(ztype == MASTERZONE || ztype == HINTZONE)) ||
(ztype == MASTERZONE || ztype == HINTZONE)) ||
(ztype == SLAVEZONE && res1 == ISC_R_SUCCESS)) {
cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR,
"zone '%s': missing 'file' entry",

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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, 2013 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2000, 2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2005, 2007, 2013 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
@ -356,7 +356,7 @@ static void
levent_destroy(isc_event_t *event) {
dns_lookupevent_t *levent;
isc_mem_t *mctx;
REQUIRE(event->ev_type == DNS_EVENT_LOOKUPDONE);
mctx = event->ev_destroy_arg;
levent = (dns_lookupevent_t *)event;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -69,7 +69,7 @@ alloc_pool(isc_mem_t *mctx, unsigned int count, isc_pool_t **poolp) {
}
isc_result_t
isc_pool_create(isc_mem_t *mctx, unsigned int count,
isc_pool_create(isc_mem_t *mctx, unsigned int count,
isc_pooldeallocator_t free,
isc_poolinitializer_t init, void *initarg,
isc_pool_t **poolp)

View file

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

View file

@ -1,4 +1,4 @@
# Copyright (C) 2011, 2012 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2011-2013 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

View file

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

View file

@ -223,7 +223,7 @@
./bin/named/win32/named.mak X 2001,2002,2004,2005,2006,2008,2009,2010,2011
./bin/named/win32/ntservice.c C 1999,2000,2001,2002,2004,2006,2007,2009,2011
./bin/named/win32/os.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2012
./bin/named/xfrout.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./bin/named/xfrout.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./bin/named/zoneconf.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./bin/nsupdate/.gitignore X 2012
./bin/nsupdate/Makefile.in MAKE 2000,2001,2002,2004,2006,2007,2008,2009,2012,2013
@ -2185,10 +2185,10 @@
./lib/dns/Atffile X 2011
./lib/dns/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./lib/dns/acache.c C 2004,2005,2006,2007,2008,2012
./lib/dns/acl.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011
./lib/dns/acl.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013
./lib/dns/adb.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/dns/api X 1999,2000,2001,2006,2008,2009,2010,2011,2012,2013
./lib/dns/byaddr.c C 2000,2001,2002,2003,2004,2005,2007,2009
./lib/dns/byaddr.c C 2000,2001,2002,2003,2004,2005,2007,2009,2013
./lib/dns/cache.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
./lib/dns/callbacks.c C 1999,2000,2001,2004,2005,2007,2011
./lib/dns/client.c C 2009,2010,2011,2012
@ -2196,8 +2196,8 @@
./lib/dns/compress.c C 1999,2000,2001,2004,2005,2006,2007
./lib/dns/db.c C 1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012
./lib/dns/dbiterator.c C 1999,2000,2001,2004,2005,2007
./lib/dns/dbtable.c C 1999,2000,2001,2004,2005,2007
./lib/dns/diff.c C 2000,2001,2002,2003,2004,2005,2007,2008,2009,2011
./lib/dns/dbtable.c C 1999,2000,2001,2004,2005,2007,2013
./lib/dns/diff.c C 2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2013
./lib/dns/dispatch.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013
./lib/dns/dlz.c C.PORTION 1999,2000,2001,2005,2007,2009,2010,2011,2012,2013
./lib/dns/dns64.c C 2010,2011
@ -2309,14 +2309,14 @@
./lib/dns/include/dst/gssapi.h C 2000,2001,2004,2005,2006,2007,2009,2010,2011
./lib/dns/include/dst/lib.h C 1999,2000,2001,2004,2005,2006,2007
./lib/dns/include/dst/result.h C 1999,2000,2001,2004,2005,2006,2007,2008,2012
./lib/dns/iptable.c C 2007,2008,2009
./lib/dns/journal.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011
./lib/dns/iptable.c C 2007,2008,2009,2013
./lib/dns/journal.c C 1999,2000,2001,2002,2004,2005,2007,2008,2009,2010,2011,2013
./lib/dns/key.c C 2001,2004,2005,2006,2007,2011
./lib/dns/keydata.c C 2009
./lib/dns/keytable.c C 2000,2001,2004,2005,2007,2009,2010
./lib/dns/keytable.c C 2000,2001,2004,2005,2007,2009,2010,2013
./lib/dns/lib.c C 1999,2000,2001,2004,2005,2007,2009
./lib/dns/log.c C 1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012
./lib/dns/lookup.c C 2000,2001,2003,2004,2005,2007
./lib/dns/lookup.c C 2000,2001,2003,2004,2005,2007,2013
./lib/dns/master.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013
./lib/dns/masterdump.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012
./lib/dns/message.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
@ -2334,7 +2334,7 @@
./lib/dns/peer.c C 2000,2001,2003,2004,2005,2006,2007,2008,2009,2012
./lib/dns/portlist.c C 2003,2004,2005,2006,2007
./lib/dns/private.c C 2009,2011,2012
./lib/dns/rbt.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012
./lib/dns/rbt.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012,2013
./lib/dns/rbtdb.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./lib/dns/rbtdb.h C 1999,2000,2001,2004,2005,2007,2011,2012
./lib/dns/rbtdb64.c C 1999,2000,2001,2004,2005,2007
@ -2498,7 +2498,7 @@
./lib/dns/tests/dbiterator_test.c C 2011,2012
./lib/dns/tests/dbversion_test.c C 2011,2012
./lib/dns/tests/dispatch_test.c C 2012
./lib/dns/tests/dnstest.c C 2011,2012
./lib/dns/tests/dnstest.c C 2011,2012,2013
./lib/dns/tests/dnstest.h C 2011,2012
./lib/dns/tests/master_test.c C 2011,2012,2013
./lib/dns/tests/mkraw.pl PERL 2011,2012
@ -2537,7 +2537,7 @@
./lib/dns/tests/testdata/zt/zone1.db ZONE 2011,2012
./lib/dns/tests/time_test.c C 2011,2012
./lib/dns/tests/update_test.c C 2011,2012
./lib/dns/tests/zonemgr_test.c C 2011,2012
./lib/dns/tests/zonemgr_test.c C 2011,2012,2013
./lib/dns/tests/zt_test.c C 2011,2012
./lib/dns/time.c C 1998,1999,2000,2001,2002,2003,2004,2005,2007,2009,2010,2011,2012
./lib/dns/timer.c C 2000,2001,2004,2005,2007
@ -2616,7 +2616,7 @@
./lib/irs/resconf.c C 2009,2011,2012
./lib/irs/version.c C 2009
./lib/isc/Atffile X 2011
./lib/isc/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/isc/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./lib/isc/alpha/Makefile.in MAKE 2007,2012
./lib/isc/alpha/include/Makefile.in MAKE 2007,2012
./lib/isc/alpha/include/isc/Makefile.in MAKE 2007,2012
@ -2694,11 +2694,12 @@
./lib/isc/include/isc/os.h C 2000,2001,2004,2005,2006,2007
./lib/isc/include/isc/parseint.h C 2001,2002,2004,2005,2006,2007
./lib/isc/include/isc/platform.h.in C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010
./lib/isc/include/isc/pool.h C 2013
./lib/isc/include/isc/portset.h C 2008,2009
./lib/isc/include/isc/print.h C 1999,2000,2001,2003,2004,2005,2006,2007
./lib/isc/include/isc/queue.h C 2011,2012,2013
./lib/isc/include/isc/quota.h C 2000,2001,2004,2005,2007
./lib/isc/include/isc/radix.h C 2007,2008
./lib/isc/include/isc/radix.h C 2007,2008,2013
./lib/isc/include/isc/random.h C 1999,2000,2001,2004,2005,2006,2007,2009
./lib/isc/include/isc/ratelimiter.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009
./lib/isc/include/isc/refcount.h C 2001,2003,2004,2005,2006,2007,2009
@ -2731,7 +2732,7 @@
./lib/isc/lex.c C 1998,1999,2000,2001,2002,2003,2004,2005,2007
./lib/isc/lfsr.c C 1999,2000,2001,2002,2004,2005,2007
./lib/isc/lib.c C 1999,2000,2001,2004,2005,2007,2009
./lib/isc/log.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012
./lib/isc/log.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2011,2012,2013
./lib/isc/md5.c C 2000,2001,2004,2005,2007,2009
./lib/isc/mem.c C 1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012
./lib/isc/mem_api.c C 2009,2010
@ -2760,6 +2761,7 @@
./lib/isc/nothreads/thread.c C 2000,2001,2004,2007
./lib/isc/ondestroy.c C 2000,2001,2004,2005,2007
./lib/isc/parseint.c C 2001,2002,2003,2004,2005,2007,2012
./lib/isc/pool.c C 2013
./lib/isc/portset.c C 2008
./lib/isc/powerpc/Makefile.in MAKE 2007,2012
./lib/isc/powerpc/include/Makefile.in MAKE 2007,2012
@ -2777,7 +2779,7 @@
./lib/isc/pthreads/mutex.c C 2000,2001,2002,2004,2005,2007,2008,2011,2012
./lib/isc/pthreads/thread.c C 2000,2001,2003,2004,2005,2007,2013
./lib/isc/quota.c C 2000,2001,2004,2005,2007
./lib/isc/radix.c C 2007,2008,2009,2011,2012
./lib/isc/radix.c C 2007,2008,2009,2011,2012,2013
./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,2012
./lib/isc/refcount.c C 2005,2007
@ -2802,11 +2804,12 @@
./lib/isc/task_p.h C 2000,2001,2004,2005,2007,2009,2011,2012
./lib/isc/taskpool.c C 1999,2000,2001,2004,2005,2007,2011,2012
./lib/isc/tests/Atffile X 2011
./lib/isc/tests/Makefile.in MAKE 2011,2012
./lib/isc/tests/Makefile.in MAKE 2011,2012,2013
./lib/isc/tests/hash_test.c C 2011,2012
./lib/isc/tests/isctest.c C 2011,2012
./lib/isc/tests/isctest.h C 2011,2012
./lib/isc/tests/parse_test.c C 2012,2013
./lib/isc/tests/pool_test.c C 2013
./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
@ -2892,10 +2895,10 @@
./lib/isc/win32/ipv6.c C 1999,2000,2001,2004,2007
./lib/isc/win32/keyboard.c C 2000,2001,2004,2007
./lib/isc/win32/libgen.h C 2009
./lib/isc/win32/libisc.def X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/isc/win32/libisc.dsp X 2001,2002,2003,2004,2005,2006,2007,2008,2009
./lib/isc/win32/libisc.def X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./lib/isc/win32/libisc.dsp X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2013
./lib/isc/win32/libisc.dsw X 2001
./lib/isc/win32/libisc.mak X 2001,2002,2003,2004,2005,2006,2007,2008,2009
./lib/isc/win32/libisc.mak X 2001,2002,2003,2004,2005,2006,2007,2008,2009,2013
./lib/isc/win32/net.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2011,2012
./lib/isc/win32/netdb.h C 2000,2001,2004,2006,2007,2009
./lib/isc/win32/ntgroups.c C 2001,2004,2006,2007,2009