diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 595a71db1f11de7521f1ab2539a14235fee37eca..8402a2cda6f8cdaa47cb3fc738d0e3ea15cee7d0 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -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-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/bin/named/geoip.c b/bin/named/geoip.c index ca2de4c69bd38057d57b2b3179c3045ff7c404d2..41063ad7e726402efbcdd60584063c1128467680 100644 --- a/bin/named/geoip.c +++ b/bin/named/geoip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/named/include/named/geoip.h b/bin/named/include/named/geoip.h index d9e88e58723dbddeda987eebaea45a92f7a6fd5f..6e0c17af8aa8ce1ebd9c3ed86c67bdcbf33e7663 100644 --- a/bin/named/include/named/geoip.h +++ b/bin/named/include/named/geoip.h @@ -1,3 +1,19 @@ +/* + * 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 + * 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. + */ + #ifndef _GEOIP_H #define _GEOIP_H diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c index eee1499651c419089eef659e1e5a437932204eef..5215307e5abff0364f3759d5c669558f74ee7b4d 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2011, 2012 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 diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 9ee9e6e2f5275e76af08ef2e992d7633db0d4610..27bc585e5b3b607fb87054a7dd3ac77acc13292e 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007, 2008, 2010-2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2008, 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 diff --git a/bin/tests/system/geoip/Makefile.in b/bin/tests/system/geoip/Makefile.in index aa7f18447a32929ba63b4cff226834966dd6379a..1cf9d4ab80f8e124c0f95705f15d20418b44751f 100644 --- a/bin/tests/system/geoip/Makefile.in +++ b/bin/tests/system/geoip/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 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 diff --git a/bin/tests/system/geoip/clean.sh b/bin/tests/system/geoip/clean.sh index 5a0f707c98ee2fbb9284264e93fce1d57f35be2f..e3397a7c7d5de340a10d2736973d7713ccc96cba 100644 --- a/bin/tests/system/geoip/clean.sh +++ b/bin/tests/system/geoip/clean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 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 diff --git a/bin/tests/system/geoip/data/README b/bin/tests/system/geoip/data/README index b2108db447cfe6df5f90a2ecd011ac9af005ccd6..672959af0e3a506850edbc5eb3694b80d0515117 100644 --- a/bin/tests/system/geoip/data/README +++ b/bin/tests/system/geoip/data/README @@ -1,3 +1,6 @@ +Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. + The data data files in this directory are sample GeoIP databases, generated from the corresponding CSV files. Thanks to MaxMind, Inc. for assitance with producing these files. diff --git a/bin/tests/system/geoip/geoip.c b/bin/tests/system/geoip/geoip.c index e0dadadafa9e5b0a362529ca2630acba8ac0f6ce..7c5decfe11f2e4a6a88115a0922d8daf307e680e 100644 --- a/bin/tests/system/geoip/geoip.c +++ b/bin/tests/system/geoip/geoip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/example.db.in b/bin/tests/system/geoip/ns2/example.db.in index 52a233bd551dd50b05df473f64d6469ad008d200..4729641b98b7d10c77c171d96f7873799d324ad7 100644 --- a/bin/tests/system/geoip/ns2/example.db.in +++ b/bin/tests/system/geoip/ns2/example.db.in @@ -1,4 +1,4 @@ -; Copyright (C) 2011 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 diff --git a/bin/tests/system/geoip/ns2/named1.conf b/bin/tests/system/geoip/ns2/named1.conf index b741b6f81f8aa3dcfcfd6cd560026b6db47259be..3263eb092f9df0ec08874c9758994ac19cdcaa95 100644 --- a/bin/tests/system/geoip/ns2/named1.conf +++ b/bin/tests/system/geoip/ns2/named1.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named10.conf b/bin/tests/system/geoip/ns2/named10.conf index 8814e73b5cd77ddf170bf74aeb56c89eb0648ce7..2deca77d2364911ee425f41cce542c09610c2b0d 100644 --- a/bin/tests/system/geoip/ns2/named10.conf +++ b/bin/tests/system/geoip/ns2/named10.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named11.conf b/bin/tests/system/geoip/ns2/named11.conf index a704735f7f60d4cbacf8dd792f70b0d2a0c34167..e5de5305ec3bebd92c2861cc9cb2216519b6828e 100644 --- a/bin/tests/system/geoip/ns2/named11.conf +++ b/bin/tests/system/geoip/ns2/named11.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named2.conf b/bin/tests/system/geoip/ns2/named2.conf index 504f89f2106c76c0066ac6bf370c208f2a7391cb..fe79635be7aa73d731860d8fa55095bb9a819fec 100644 --- a/bin/tests/system/geoip/ns2/named2.conf +++ b/bin/tests/system/geoip/ns2/named2.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named3.conf b/bin/tests/system/geoip/ns2/named3.conf index 81644807c51a5332328aded22aa672bc21b11b78..97010d04e1abb2ad420eb48b86f11b89c357a353 100644 --- a/bin/tests/system/geoip/ns2/named3.conf +++ b/bin/tests/system/geoip/ns2/named3.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named4.conf b/bin/tests/system/geoip/ns2/named4.conf index 24f5735a4af1b793794286321e66daa1d14c57d4..275f8c4f0dc42a1b83181052e250808bea1072da 100644 --- a/bin/tests/system/geoip/ns2/named4.conf +++ b/bin/tests/system/geoip/ns2/named4.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named5.conf b/bin/tests/system/geoip/ns2/named5.conf index 2a91e7f2baa2d7b40996411cbfef6e1a78109112..d6f6f8600fe8462f7852ac8ac1f1a5bfad7138c0 100644 --- a/bin/tests/system/geoip/ns2/named5.conf +++ b/bin/tests/system/geoip/ns2/named5.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named6.conf b/bin/tests/system/geoip/ns2/named6.conf index c2b27d7dd17b53d081c096f6f172a0fafb1443bf..7add649152d1643f203ed7b107bd17aa1227942b 100644 --- a/bin/tests/system/geoip/ns2/named6.conf +++ b/bin/tests/system/geoip/ns2/named6.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named7.conf b/bin/tests/system/geoip/ns2/named7.conf index 6877c02013792a2e97539fe00ab202e46ab03691..41ea564f247815bad56a5e354c4fb5b8f259b551 100644 --- a/bin/tests/system/geoip/ns2/named7.conf +++ b/bin/tests/system/geoip/ns2/named7.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named8.conf b/bin/tests/system/geoip/ns2/named8.conf index fff2bb4d34470b5985cd174c6d45175102a08f30..c83de1027e86831c8220dcd13005cbe1a05c5ee9 100644 --- a/bin/tests/system/geoip/ns2/named8.conf +++ b/bin/tests/system/geoip/ns2/named8.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/ns2/named9.conf b/bin/tests/system/geoip/ns2/named9.conf index d3cb0e6a80bf197f5405ad901f507350a526cb68..c8e40f9e81253c1b55cb44a792efaf5c52c7262f 100644 --- a/bin/tests/system/geoip/ns2/named9.conf +++ b/bin/tests/system/geoip/ns2/named9.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/bin/tests/system/geoip/prereq.sh b/bin/tests/system/geoip/prereq.sh index b78be4123d263a98e26845f58f356a639a28ae79..3fb62a21f61b15f6b0aade2352fbc3cd792e0985 100644 --- a/bin/tests/system/geoip/prereq.sh +++ b/bin/tests/system/geoip/prereq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 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 diff --git a/bin/tests/system/geoip/setup.sh b/bin/tests/system/geoip/setup.sh index 458695270bdd6042ea153d677cf337ad35299b88..e55d0353a1cac6b93981758620be5bd15f6fbd51 100644 --- a/bin/tests/system/geoip/setup.sh +++ b/bin/tests/system/geoip/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 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 diff --git a/bin/tests/system/geoip/tests.sh b/bin/tests/system/geoip/tests.sh index 42e4f547027b144b04d60e0e784dc054b1844d11..2f831f20c3f5c176c61eb72cf78c1687aebf3a9a 100644 --- a/bin/tests/system/geoip/tests.sh +++ b/bin/tests/system/geoip/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 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 diff --git a/lib/dns/acache.c b/lib/dns/acache.c index 433db2cbf5439c692a19d99b66f495f0cd65ca20..7fc9a3230d599e4160a13d2600bf0332fbcfd52e 100644 --- a/lib/dns/acache.c +++ b/lib/dns/acache.c @@ -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 diff --git a/lib/dns/adb.c b/lib/dns/adb.c index a6fa50b89981df68b94a1d7d3863a32515e1e288..e9c21fa69969c9e34a80bd70b24a331b9fcfa40f 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -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 diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c index d5fc441f603ddc0a44ae43d0082082bcd786b003..d0f44cfe00913bd95e41ba4a6012edb546ac4f23 100644 --- a/lib/dns/geoip.c +++ b/lib/dns/geoip.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in index 19a5be19f063e330e880a0a35d7e4062695094de..419d6025decd7e285435ba4bd539d7793c5a1f39 100644 --- a/lib/dns/include/dns/Makefile.in +++ b/lib/dns/include/dns/Makefile.in @@ -1,4 +1,4 @@ -# 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) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/include/dns/acache.h b/lib/dns/include/dns/acache.h index 754ef9f8a7f509c515e5a7c0ead2f92c5d20da85..37cf31f5e255b063e899dc4e848390e47ef4a2cb 100644 --- a/lib/dns/include/dns/acache.h +++ b/lib/dns/include/dns/acache.h @@ -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. */ diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h index 5ce3dc49e388b3948e2e23a73a280fbc7dc807e6..fe5cfe65ad58cd95235aaff0c781c56b2bf05ec7 100644 --- a/lib/dns/include/dns/acl.h +++ b/lib/dns/include/dns/acl.h @@ -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-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index 267ae83d554b31701727527382ee02c75722d02a..a5a312406affad0eaa7f0cf392b0a7e7e5f41223 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -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 diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h index bbab0e1bd7634f06864e8ced2ad5bfe0aaff88ec..ec26cb0da17855f4270eda030bf5f45249e80121 100644 --- a/lib/dns/include/dns/cache.h +++ b/lib/dns/include/dns/cache.h @@ -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-2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/include/dns/geoip.h b/lib/dns/include/dns/geoip.h index bad94856f016834dd0f0f874cf60a52e92460283..35a4036a12060572daf140e98fd85d578c56b927 100644 --- a/lib/dns/include/dns/geoip.h +++ b/lib/dns/include/dns/geoip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c index 099f20e33aa2d0391ed13b9ea5c28a3799a8c84b..628a331e36717043710d90cc1271667a226ec61f 100644 --- a/lib/dns/rpz.c +++ b/lib/dns/rpz.c @@ -1572,7 +1572,7 @@ dns_rpz_ready(dns_rpz_zones_t *rpzs, UNLOCK(&rpzs->search_lock); result = ISC_R_SUCCESS; - + unlock_and_detach: UNLOCK(&rpzs->maint_lock); UNLOCK(&load_rpzs->search_lock); diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in index 3c13901173439ad51e5d5309768f40c080865ef8..caaaeb42db46e2ac1618a7b40e9edffbb86e4840 100644 --- a/lib/dns/tests/Makefile.in +++ b/lib/dns/tests/Makefile.in @@ -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 diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c index e2ddf18c3361f7b5b2b40af48dd359703f298d65..48110375b36d0a4fc9fca4568f0644987378d81c 100644 --- a/lib/dns/tests/geoip_test.c +++ b/lib/dns/tests/geoip_test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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 diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c index 04a951a684c1474af7331ce72f429302f6fe7fb0..526ad0918d7b10b98bed34dd23c7df9b377b7562 100644 --- a/lib/irs/getnameinfo.c +++ b/lib/irs/getnameinfo.c @@ -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 diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c index 0df81ac604e8b39db8d00fdaf7e61aa1e6d764a3..1626d55f2f8634756091182424447a6c330f76f0 100644 --- a/lib/isccfg/aclconf.c +++ b/lib/isccfg/aclconf.c @@ -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-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h index b532e8c16d2ca488c8ca3eedae794a27df068172..5ff753dd9e6b98316bf974fcc2293e53eaa3e9cf 100644 --- a/lib/isccfg/include/isccfg/aclconf.h +++ b/lib/isccfg/include/isccfg/aclconf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2007, 2010-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 diff --git a/util/copyrights b/util/copyrights index bbe3ee097ac02aa532d569fe7d7f028888db0763..c3c5db6b8d5fe5afc41fb203679f43a4b04373c1 100644 --- a/util/copyrights +++ b/util/copyrights @@ -139,7 +139,7 @@ ./bin/dnssec/win32/signzone.dsw X 2001 ./bin/dnssec/win32/signzone.mak X 2001,2004,2005,2006,2009 ./bin/named/.gitignore X 2012 -./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012 +./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013 ./bin/named/bind.keys.h X 2009,2010,2011,2012 ./bin/named/bind9.xsl SGML 2006,2007,2008,2009,2012,2013 ./bin/named/bind9.xsl.h X 2007,2008,2009,2011,2012,2013 @@ -150,12 +150,14 @@ ./bin/named/control.c C 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013 ./bin/named/controlconf.c C 2001,2002,2003,2004,2005,2006,2007,2008,2011,2012 ./bin/named/convertxsl.pl PERL 2006,2007,2008,2012 +./bin/named/geoip.c C 2013 ./bin/named/include/.gitignore X 2012 ./bin/named/include/dlz/dlz_dlopen_driver.h C 2011 ./bin/named/include/named/builtin.h C 2001,2004,2005,2007 ./bin/named/include/named/client.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012 ./bin/named/include/named/config.h C 2001,2002,2004,2005,2006,2007,2009 ./bin/named/include/named/control.h C 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012 +./bin/named/include/named/geoip.h C 2013 ./bin/named/include/named/globals.h C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013 ./bin/named/include/named/interfacemgr.h C 1999,2000,2001,2002,2004,2005,2007,2011 ./bin/named/include/named/listenlist.h C 2000,2001,2004,2005,2007 @@ -178,7 +180,7 @@ ./bin/named/include/named/update.h C 1999,2000,2001,2004,2005,2007 ./bin/named/include/named/xfrout.h C 1999,2000,2001,2004,2005,2007 ./bin/named/include/named/zoneconf.h C 1999,2000,2001,2002,2004,2005,2006,2007,2010,2011 -./bin/named/interfacemgr.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012 +./bin/named/interfacemgr.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013 ./bin/named/listenlist.c C 2000,2001,2004,2005,2007 ./bin/named/log.c C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2013 ./bin/named/logconf.c C 1999,2000,2001,2004,2005,2006,2007,2011,2013 @@ -530,7 +532,7 @@ ./bin/tests/startperf/smallzone.db ZONE 2011 ./bin/tests/sym_test.c C 1998,1999,2000,2001,2004,2005,2007 ./bin/tests/system/.gitignore X 2012 -./bin/tests/system/Makefile.in MAKE 2000,2001,2004,2007,2008,2010,2011,2012 +./bin/tests/system/Makefile.in MAKE 2000,2001,2004,2007,2008,2010,2011,2012,2013 ./bin/tests/system/README TXT.BRIEF 2000,2001,2004,2010,2011,2013 ./bin/tests/system/acl/clean.sh SH 2008,2012 ./bin/tests/system/acl/ns2/named1.conf CONF-C 2008 @@ -990,6 +992,48 @@ ./bin/tests/system/forward/ns5/root.db ZONE 2011 ./bin/tests/system/forward/tests.sh SH 2000,2001,2004,2007,2011,2012 ./bin/tests/system/genzone.sh SH 2001,2002,2003,2004,2007,2009,2011,2012,2013 +./bin/tests/system/geoip/.gitignore X 2013 +./bin/tests/system/geoip/Makefile.in MAKE 2013 +./bin/tests/system/geoip/clean.sh SH 2013 +./bin/tests/system/geoip/data/GeoIP.csv X 2013 +./bin/tests/system/geoip/data/GeoIP.dat X 2013 +./bin/tests/system/geoip/data/GeoIPASNum.csv X 2013 +./bin/tests/system/geoip/data/GeoIPASNum.dat X 2013 +./bin/tests/system/geoip/data/GeoIPASNumv6.csv X 2013 +./bin/tests/system/geoip/data/GeoIPASNumv6.dat X 2013 +./bin/tests/system/geoip/data/GeoIPCity.csv X 2013 +./bin/tests/system/geoip/data/GeoIPCity.dat X 2013 +./bin/tests/system/geoip/data/GeoIPCityv6.csv X 2013 +./bin/tests/system/geoip/data/GeoIPCityv6.dat X 2013 +./bin/tests/system/geoip/data/GeoIPDomain.csv X 2013 +./bin/tests/system/geoip/data/GeoIPDomain.dat X 2013 +./bin/tests/system/geoip/data/GeoIPISP.csv X 2013 +./bin/tests/system/geoip/data/GeoIPISP.dat X 2013 +./bin/tests/system/geoip/data/GeoIPNetSpeed.csv X 2013 +./bin/tests/system/geoip/data/GeoIPNetSpeed.dat X 2013 +./bin/tests/system/geoip/data/GeoIPOrg.csv X 2013 +./bin/tests/system/geoip/data/GeoIPOrg.dat X 2013 +./bin/tests/system/geoip/data/GeoIPRegion.csv X 2013 +./bin/tests/system/geoip/data/GeoIPRegion.dat X 2013 +./bin/tests/system/geoip/data/GeoIPv6.csv X 2013 +./bin/tests/system/geoip/data/GeoIPv6.dat X 2013 +./bin/tests/system/geoip/data/README TXT.BRIEF 2013 +./bin/tests/system/geoip/geoip.c C 2013 +./bin/tests/system/geoip/ns2/example.db.in ZONE 2013 +./bin/tests/system/geoip/ns2/named1.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named10.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named11.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named2.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named3.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named4.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named5.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named6.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named7.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named8.conf CONF-C 2013 +./bin/tests/system/geoip/ns2/named9.conf CONF-C 2013 +./bin/tests/system/geoip/prereq.sh SH 2013 +./bin/tests/system/geoip/setup.sh SH 2013 +./bin/tests/system/geoip/tests.sh SH 2013 ./bin/tests/system/glue/clean.sh SH 2000,2001,2004,2007,2012 ./bin/tests/system/glue/fi.good X 2000,2001 ./bin/tests/system/glue/noglue.good X 2000,2001 @@ -1671,7 +1715,7 @@ ./bin/win32/BINDInstall/resource.h X 2001,2005,2009 ./bind.keys X 2009,2010,2011 ./config.guess X 1998,1999,2000,2001,2004,2009 -./config.h.in X 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 +./config.h.in X 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013 ./config.h.win32 C 1999,2000,2001,2004,2006,2007,2008,2009,2011,2012 ./config.sub X 1998,1999,2000,2001,2004 ./config.threads.in X 2005,2006,2010,2011,2012 @@ -2254,9 +2298,9 @@ ./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,2012,2013 @@ -2285,17 +2329,18 @@ ./lib/dns/gen-unix.h C 1999,2000,2001,2004,2005,2007,2009 ./lib/dns/gen-win32.h C 1999,2000,2001,2004,2005,2006,2007,2009 ./lib/dns/gen.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013 +./lib/dns/geoip.c C 2013 ./lib/dns/gssapi_link.c C 2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012 ./lib/dns/gssapictx.c C 2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012 ./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/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/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013 +./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,2013 +./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,2012 +./lib/dns/include/dns/cache.h C 1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013 ./lib/dns/include/dns/callbacks.h C 1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013 ./lib/dns/include/dns/cert.h C 1999,2000,2001,2004,2005,2006,2007 ./lib/dns/include/dns/client.h C 2009 @@ -2316,6 +2361,7 @@ ./lib/dns/include/dns/events.h C 1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011 ./lib/dns/include/dns/fixedname.h C 1999,2000,2001,2004,2005,2006,2007 ./lib/dns/include/dns/forward.h C 2000,2001,2004,2005,2006,2007,2009 +./lib/dns/include/dns/geoip.h C 2013 ./lib/dns/include/dns/iptable.h C 2007,2012 ./lib/dns/include/dns/journal.h C 1999,2000,2001,2004,2005,2006,2007,2008,2009,2011 ./lib/dns/include/dns/keydata.h C 2009 @@ -2567,13 +2613,14 @@ ./lib/dns/stats.c C 2000,2001,2004,2005,2007,2008,2009,2012 ./lib/dns/tcpmsg.c C 1999,2000,2001,2004,2005,2006,2007 ./lib/dns/tests/Atffile X 2011 -./lib/dns/tests/Makefile.in MAKE 2011,2012 +./lib/dns/tests/Makefile.in MAKE 2011,2012,2013 ./lib/dns/tests/dbdiff_test.c C 2011,2012 ./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,2013 ./lib/dns/tests/dnstest.h C 2011,2012 +./lib/dns/tests/geoip_test.c C 2013 ./lib/dns/tests/master_test.c C 2011,2012,2013 ./lib/dns/tests/mkraw.pl PERL 2011,2012 ./lib/dns/tests/nsec3_test.c C 2012 @@ -2679,7 +2726,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 @@ -3037,12 +3084,12 @@ ./lib/isccc/win32/libisccc.mak X 2001,2002,2004,2005,2006,2009,2011 ./lib/isccc/win32/version.c C 2001,2004,2007 ./lib/isccfg/Makefile.in MAKE 2001,2002,2003,2004,2005,2007,2009,2011,2012 -./lib/isccfg/aclconf.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012 +./lib/isccfg/aclconf.c C 1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013 ./lib/isccfg/api X 2001,2006,2008,2009,2010,2011,2012 ./lib/isccfg/dnsconf.c C 2009 ./lib/isccfg/include/Makefile.in MAKE 2001,2004,2007,2012 ./lib/isccfg/include/isccfg/Makefile.in MAKE 2001,2002,2004,2005,2007,2012 -./lib/isccfg/include/isccfg/aclconf.h C 1999,2000,2001,2004,2005,2006,2007,2010,2011,2012 +./lib/isccfg/include/isccfg/aclconf.h C 1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013 ./lib/isccfg/include/isccfg/cfg.h C 2000,2001,2002,2004,2005,2006,2007,2010,2013 ./lib/isccfg/include/isccfg/dnsconf.h C 2009 ./lib/isccfg/include/isccfg/grammar.h C 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011