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

This commit is contained in:
Evan Hunt 2013-02-28 16:48:55 -08:00
commit 334e322a3d
9 changed files with 20 additions and 20 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2008, 2012 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2008, 2012, 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) 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) 2004-2009, 2011 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-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) 2004, 2006, 2007 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004, 2006, 2007, 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
@ -25,7 +25,7 @@
/*
* Acache
*
*
* The Additional Cache Object
*
* This module manages internal caching entries that correspond to
@ -131,7 +131,7 @@
* - 76 bytes for each additional cache entry
* - if the entry has a DNS name and associated RRset,
* * 44 bytes + size of the name (1-255 bytes)
* * 52 bytes x number_of_RRs
* * 52 bytes x number_of_RRs
* - 28 bytes for each DB related to this module
*
* Using the additional cache also requires extra memory consumption in
@ -415,7 +415,7 @@ dns_acache_attachentry(dns_acacheentry_t *source, dns_acacheentry_t **targetp);
*
* *targetp is attached to 'source'.
*/
void
dns_acache_detachentry(dns_acacheentry_t **entryp);
/*
@ -429,7 +429,7 @@ dns_acache_detachentry(dns_acacheentry_t **entryp);
*
* *entryp is NULL.
*
* If '*entryp' is the last reference to the entry,
* If '*entryp' is the last reference to the entry,
* cache does not have an outstanding task, all resources used by the
* entry (including the entry object itself) will be freed.
*/

View file

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

@ -2192,12 +2192,12 @@
./lib/dns/.gitignore X 2012
./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/acache.c C 2004,2005,2006,2007,2008,2012,2013
./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/adb.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./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,2013
./lib/dns/cache.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011
./lib/dns/cache.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2013
./lib/dns/callbacks.c C 1999,2000,2001,2004,2005,2007,2011
./lib/dns/client.c C 2009,2010,2011,2012
./lib/dns/clientinfo.c C 2011
@ -2228,12 +2228,12 @@
./lib/dns/hmac_link.c C.NAI 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/dns/include/Makefile.in MAKE 1998,1999,2000,2001,2004,2007,2012
./lib/dns/include/dns/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012
./lib/dns/include/dns/acache.h C 2004,2006,2007
./lib/dns/include/dns/acache.h C 2004,2006,2007,2013
./lib/dns/include/dns/acl.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2011
./lib/dns/include/dns/adb.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011
./lib/dns/include/dns/adb.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013
./lib/dns/include/dns/bit.h C 2000,2001,2004,2005,2006,2007
./lib/dns/include/dns/byaddr.h C 2000,2001,2002,2003,2004,2005,2006,2007
./lib/dns/include/dns/cache.h C 1999,2000,2001,2004,2005,2006,2007,2009,2011
./lib/dns/include/dns/cache.h C 1999,2000,2001,2004,2005,2006,2007,2009,2011,2013
./lib/dns/include/dns/callbacks.h C 1999,2000,2001,2002,2004,2005,2006,2007,2011
./lib/dns/include/dns/cert.h C 1999,2000,2001,2004,2005,2006,2007
./lib/dns/include/dns/client.h C 2009
@ -2556,7 +2556,7 @@
./lib/dns/update.c C 2011,2012
./lib/dns/validator.c C 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./lib/dns/version.c C 1998,1999,2000,2001,2004,2005,2007
./lib/dns/view.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
./lib/dns/view.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
./lib/dns/win32/DLLMain.c C 2001,2004,2007
./lib/dns/win32/gen.dsp X 2001
./lib/dns/win32/gen.dsw X 2001
@ -2611,7 +2611,7 @@
./lib/irs/dnsconf.c C 2009,2012
./lib/irs/gai_strerror.c C 2009
./lib/irs/getaddrinfo.c C 2009,2012
./lib/irs/getnameinfo.c C 2009,2011,2012
./lib/irs/getnameinfo.c C 2009,2011,2012,2013
./lib/irs/include/Makefile.in MAKE 2009,2012
./lib/irs/include/irs/Makefile.in MAKE 2009,2012
./lib/irs/include/irs/context.h C 2009