update copyrights

diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 7b7941d6e0fc886e36334a5e2b28bfbd3c0978f0..3ba0c64a712d874bad43f4a255709cd981699a06 100644 (file)
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -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/bin/tests/system/rpz/Makefile.in b/bin/tests/system/rpz/Makefile.in
index 370856cb20e78149a745709a2aed450f5b21ce9f..4042217def1de107bc2e9dcea1b45ceda4c74f32 100644 (file)
--- a/bin/tests/system/rpz/Makefile.in
+++ b/bin/tests/system/rpz/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/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index 7aec269fa394acdc96ab16ab4ca87e7b2dfa15b2..d0c47976e3650709ba10d17b7aa22e0b385105f0 100644 (file)
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -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/bin/tests/system/rpz/ns1/named.conf b/bin/tests/system/rpz/ns1/named.conf
index 2e01452aff1c81cddbf07d3f4db2bff1157fcd2b..9e627739ea24674218cb91c0252345c449c69f6e 100644 (file)
--- a/bin/tests/system/rpz/ns1/named.conf
+++ b/bin/tests/system/rpz/ns1/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011  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/bin/tests/system/rpz/ns1/root.db b/bin/tests/system/rpz/ns1/root.db
index f3565a542e671382f4c6c6504f92b3bab3ce5e83..32c14dba23915724325cdb97198affaa6cc04227 100644 (file)
--- a/bin/tests/system/rpz/ns1/root.db
+++ b/bin/tests/system/rpz/ns1/root.db
@@ -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/bin/tests/system/rpz/ns2/base-tld2s.db b/bin/tests/system/rpz/ns2/base-tld2s.db
index 33497e5ba91cc6bea33c79e291d9ae0235630fd9..59eb5edbff181827036431232094fb2b56e86e33 100644 (file)
--- a/bin/tests/system/rpz/ns2/base-tld2s.db
+++ b/bin/tests/system/rpz/ns2/base-tld2s.db
@@ -1,4 +1,4 @@
-; Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 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/bin/tests/system/rpz/ns2/hints b/bin/tests/system/rpz/ns2/hints
index 168846004599129117de9ff91042661ace49a48e..844529c7d43e2c14466629dd03e017e45f619b20 100644 (file)
--- a/bin/tests/system/rpz/ns2/hints
+++ b/bin/tests/system/rpz/ns2/hints
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  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/bin/tests/system/rpz/ns2/named.conf b/bin/tests/system/rpz/ns2/named.conf
index aa040a5dd67cd9c70e96988eeff178fad84954d9..c2235af24b34531b57bf3d276b6a95ce7e42b647 100644 (file)
--- a/bin/tests/system/rpz/ns2/named.conf
+++ b/bin/tests/system/rpz/ns2/named.conf
@@ -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

diff --git a/bin/tests/system/rpz/ns2/tld2.db b/bin/tests/system/rpz/ns2/tld2.db
index 7b003c3809fb48ebad6b5ec17fac59b1b1e63e93..eeb431530336558caf33137c69f19048740bde6e 100644 (file)
--- a/bin/tests/system/rpz/ns2/tld2.db
+++ b/bin/tests/system/rpz/ns2/tld2.db
@@ -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/bin/tests/system/rpz/ns3/base.db b/bin/tests/system/rpz/ns3/base.db
index d1c266316490547463d4dd870d2860f364cf225f..475257a6cf39fca21ebdec13017e84baeffaea41 100644 (file)
--- a/bin/tests/system/rpz/ns3/base.db
+++ b/bin/tests/system/rpz/ns3/base.db
@@ -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/bin/tests/system/rpz/ns3/hints b/bin/tests/system/rpz/ns3/hints
index 168846004599129117de9ff91042661ace49a48e..844529c7d43e2c14466629dd03e017e45f619b20 100644 (file)
--- a/bin/tests/system/rpz/ns3/hints
+++ b/bin/tests/system/rpz/ns3/hints
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  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/bin/tests/system/rpz/ns3/named.conf b/bin/tests/system/rpz/ns3/named.conf
index 1e8a983403b8a8a19ac68799f6199518f37ed363..2acb9774219ce199970e557d149f3660e615825e 100644 (file)
--- a/bin/tests/system/rpz/ns3/named.conf
+++ b/bin/tests/system/rpz/ns3/named.conf
@@ -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

diff --git a/bin/tests/system/rpz/ns4/hints b/bin/tests/system/rpz/ns4/hints
index 168846004599129117de9ff91042661ace49a48e..844529c7d43e2c14466629dd03e017e45f619b20 100644 (file)
--- a/bin/tests/system/rpz/ns4/hints
+++ b/bin/tests/system/rpz/ns4/hints
@@ -1,4 +1,4 @@
-; Copyright (C) 2011  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/bin/tests/system/rpz/ns4/named.conf b/bin/tests/system/rpz/ns4/named.conf
index afcf91e8a83353a465201b562d34d94019474c59..174e7466f764c4f874ae81dab46bdbe0a10c423c 100644 (file)
--- a/bin/tests/system/rpz/ns4/named.conf
+++ b/bin/tests/system/rpz/ns4/named.conf
@@ -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

diff --git a/bin/tests/system/rpz/ns4/tld4.db b/bin/tests/system/rpz/ns4/tld4.db
index 3f21d4ef8a7ed26f4ecf9fbbfae3877cd039ad70..1f26cb99d54cebcd22193c4c4eb271f941af072d 100644 (file)
--- a/bin/tests/system/rpz/ns4/tld4.db
+++ b/bin/tests/system/rpz/ns4/tld4.db
@@ -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/bin/tests/system/rpz/ns5/hints b/bin/tests/system/rpz/ns5/hints
index 120b987f14caeddca6de5a500901a86c864cce96..7d20df052948da59007076bf3ba53bfc1d49941f 100644 (file)
--- a/bin/tests/system/rpz/ns5/hints
+++ b/bin/tests/system/rpz/ns5/hints
@@ -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/bin/tests/system/rpz/ns5/named.conf b/bin/tests/system/rpz/ns5/named.conf
index 0b9761964cef87bf742f4865a98734e48c2a11fd..82b6fdedf485d826c45d40cee8ea2880a17cface 100644 (file)
--- a/bin/tests/system/rpz/ns5/named.conf
+++ b/bin/tests/system/rpz/ns5/named.conf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 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/bin/tests/system/rpz/ns5/tld5.db b/bin/tests/system/rpz/ns5/tld5.db
index a40877a2f599a4a8d86f0eb8744e88ad6e9b995b..d20a5473a588f1e5bcdd0481c4daa06b318819de 100644 (file)
--- a/bin/tests/system/rpz/ns5/tld5.db
+++ b/bin/tests/system/rpz/ns5/tld5.db
@@ -1,4 +1,4 @@
-; 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/rpz/qperf.sh b/bin/tests/system/rpz/qperf.sh
index f33d8bff038a414f400e1f3eebcfd946455fffb2..cb0a29b0d8e2c17c667bac25b9093809eb52d837 100644 (file)
--- a/bin/tests/system/rpz/qperf.sh
+++ b/bin/tests/system/rpz/qperf.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 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/bin/tests/system/rpz/rpz.c b/bin/tests/system/rpz/rpz.c
index 0deac4611f5c79a51615fbda721210250359e47b..a1053a8d61de3e88c06b8960a25849cc3c4c80d8 100644 (file)
--- a/bin/tests/system/rpz/rpz.c
+++ b/bin/tests/system/rpz/rpz.c
@@ -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

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 52f448841517402c254850f5391a0cec933fe2b0..5a0f9046700df3446bd2f0ff14701b458b9770e1 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# 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/bin/tests/system/rpz/test3 b/bin/tests/system/rpz/test3
index fe7ec0ba68cb9d14254e026dfdc89f2da7be19d8..75cb8c95993a7a7af4add4b3c7f15e3811ace3e3 100644 (file)
--- a/bin/tests/system/rpz/test3
+++ b/bin/tests/system/rpz/test3
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013  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/bin/tests/system/rpz/test4 b/bin/tests/system/rpz/test4
index d383362dfca5cc6f76ba3adfc1a6585a32398ce5..3140ee6349d3c5573e8bc4619d410065cca38edb 100644 (file)
--- a/bin/tests/system/rpz/test4
+++ b/bin/tests/system/rpz/test4
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013  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/bin/tests/system/rpz/test4a b/bin/tests/system/rpz/test4a
index 7360f627a19c949e6f5628a79f53693f38d92b88..f014978fd2eb9e5714223df48aff9c437b0bd812 100644 (file)
--- a/bin/tests/system/rpz/test4a
+++ b/bin/tests/system/rpz/test4a
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013  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/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index b2c3842c75e4ed215b4998aebe34da56026f421f..5b6c4bf50d9679ff89cb666302f5715ee1bb0ca2 100644 (file)
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -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/db.c b/lib/dns/db.c
index 6b03b8c2351a0712df989fe13cac18c333a63a6a..bf4a5b37540cc332b350dd1657005f6fc3a697ad 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -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-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index b0fe8fb1d2becd872b51b4794286759841501fad..66bc3e3481e18494ae148b32d715e932a71681ba 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -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-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index b82cb12fd658118a1c3c03ab2db2d94e8ae76622..e1d50a53b555222f4b914e7dc4eadaf8ea99b46f 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -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

diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 233cca9c212692f9794822e75eec2242f79ce1f4..d0c1931d27bed5c1b3405160603cbc04e258cbd0 100644 (file)
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -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/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index a2eb18de7141049440712ce50863425e9be11dcc..83439a59293ee12961a26160b2d50fabed096d95 100644 (file)
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -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-2001, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 3fbe6124385cb73cec541335522ca01e56b9fc0d..2d689e7ba128218f0bbc4c8e47afd4e98cd781de 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -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

diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in
index 7bb3913169bb752f0264bb00ad681f41caa805e5..c04a9073dcc3bbf0bd041c33ab9cd03766a87957 100644 (file)
--- a/lib/export/isc/Makefile.in
+++ b/lib/export/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 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/export/isc/include/isc/Makefile.in b/lib/export/isc/include/isc/Makefile.in
index 0d2f9b49855c172287a14ea28c0e4dd9b58fea94..8c7eff8efa24d835aed72242edfc9f5ef5c2bae1 100644 (file)
--- a/lib/export/isc/include/isc/Makefile.in
+++ b/lib/export/isc/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 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/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 68b910ca55b8de56723b7feee008e435fc418171..8afcfa73cb802c0395484f8373b06385dc20553d 100644 (file)
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h
index 85d9145e52092f4dd604f18413f7047bd6874556..ccca272ae52289654c1947263f329964e20832ce 100644 (file)
--- a/lib/isc/include/isc/region.h
+++ b/lib/isc/include/isc/region.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 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
@@ -87,9 +87,9 @@ ISC_LANG_BEGINDECLS
 int
 isc_region_compare(isc_region_t *r1, isc_region_t *r2);
 /*%<
- * Compares the contents of two regions 
+ * Compares the contents of two regions
  *
- * Requires: 
+ * Requires:
  *\li  'r1' is a valid region
  *\li  'r2' is a valid region
  *

diff --git a/lib/isc/regex.c b/lib/isc/regex.c
index d42a6bf389f04defa3258fb7be5c466cf8dae81e..279bcdc437fbdcd2ce4abcd03ce22de2eb347e00 100644 (file)
--- a/lib/isc/regex.c
+++ b/lib/isc/regex.c
@@ -33,7 +33,7 @@ int
 isc_regex_validate(const char *c) {
        enum {
                none, parse_bracket, parse_bound,
-               parse_ce, parse_ec, parse_cc 
+               parse_ce, parse_ec, parse_cc
        } state = none;
        /* Well known character classes. */
        const char *cc[] = {
@@ -63,7 +63,7 @@ isc_regex_validate(const char *c) {
 
        if (c == NULL || *c == 0)
                FAIL("empty string");
-       
+
        while (c != NULL && *c != 0) {
                switch (state) {
                case none:

diff --git a/lib/isc/tests/regex_test.c b/lib/isc/tests/regex_test.c
index 8bc5584f97c019833a605de64db44c4a551388d4..fcf4534103a6d0e6f99e62124ca3c0f740d2fd74 100644 (file)
--- a/lib/isc/tests/regex_test.c
+++ b/lib/isc/tests/regex_test.c
@@ -30,7 +30,7 @@
 
 ATF_TC(regex_validate);
 ATF_TC_HEAD(regex_validate, tc) {
-        atf_tc_set_md_var(tc, "descr", "check isc_regex_validate()");
+       atf_tc_set_md_var(tc, "descr", "check isc_regex_validate()");
 }
 ATF_TC_BODY(regex_validate, tc) {
        /*
@@ -1098,7 +1098,7 @@ ATF_TC_BODY(regex_validate, tc) {
                }
                if (r == 0)
                        regfree(&preg);
-        }
+       }
 #endif
 
        /*
@@ -1117,7 +1117,7 @@ ATF_TC_BODY(regex_validate, tc) {
  * Main
  */
 ATF_TP_ADD_TCS(tp) {
-        ATF_TP_ADD_TC(tp, regex_validate);
-        return (atf_no_error());
+       ATF_TP_ADD_TC(tp, regex_validate);
+       return (atf_no_error());
 }
 

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 784dd9445732fba66477aa0a0a432205df079bb3..f5062e86c0141fa86c8c45abda9531274a6ca10d 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.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) 2002, 2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

diff --git a/util/copyrights b/util/copyrights
index bcf649840d8ccc7e38381898462b733b5548b16b..c91f8f897fac4792c6339bd9aa7f11d246f00fc8 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -171,7 +171,7 @@
 ./bin/named/include/named/notify.h             C       1999,2000,2001,2004,2005,2007,2009
 ./bin/named/include/named/ns_smf_globals.h     C       2005,2007
 ./bin/named/include/named/query.h              C       1999,2000,2001,2002,2004,2005,2007,2010,2011
-./bin/named/include/named/server.h             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./bin/named/include/named/server.h             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./bin/named/include/named/sortlist.h           C       2000,2001,2004,2005,2006,2007
 ./bin/named/include/named/statschannel.h       C       2008
 ./bin/named/include/named/tkeyconf.h           C       1999,2000,2001,2004,2005,2006,2007
@@ -1197,33 +1197,36 @@
 ./bin/tests/system/rndc/setup.sh               SH      2011,2012
 ./bin/tests/system/rndc/tests.sh               SH      2011,2012
 ./bin/tests/system/rpz/.gitignore              X       2012
-./bin/tests/system/rpz/Makefile.in             MAKE    2011,2012
-./bin/tests/system/rpz/clean.sh                        SH      2011,2012
-./bin/tests/system/rpz/ns1/named.conf          CONF-C  2011
-./bin/tests/system/rpz/ns1/root.db             ZONE    2011,2012
-./bin/tests/system/rpz/ns2/base-tld2s.db       ZONE    2012
-./bin/tests/system/rpz/ns2/hints               ZONE    2011
-./bin/tests/system/rpz/ns2/named.conf          CONF-C  2011,2012
-./bin/tests/system/rpz/ns2/tld2.db             ZONE    2011,2012
-./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012
-./bin/tests/system/rpz/ns3/crash1              X       2011
-./bin/tests/system/rpz/ns3/crash2              X       2011,2012
-./bin/tests/system/rpz/ns3/hints               ZONE    2011
-./bin/tests/system/rpz/ns3/named.conf          CONF-C  2011,2012
-./bin/tests/system/rpz/ns4/hints               ZONE    2011
-./bin/tests/system/rpz/ns4/named.conf          CONF-C  2011,2012
-./bin/tests/system/rpz/ns4/tld4.db             ZONE    2011,2012
-./bin/tests/system/rpz/ns5/hints               ZONE    2011,2012
-./bin/tests/system/rpz/ns5/named.conf          CONF-C  2012
-./bin/tests/system/rpz/qperf.sh                        SH      2012
-./bin/tests/system/rpz/rpz.c                   C       2011,2012
-./bin/tests/system/rpz/setup.sh                        SH      2011,2012
-./bin/tests/system/rpz/test1                   X       2011,2012
-./bin/tests/system/rpz/test2                   X       2011,2012
-./bin/tests/system/rpz/test3                   X       2011
-./bin/tests/system/rpz/test4                   X       2011
-./bin/tests/system/rpz/test5                   X       2011,2012
-./bin/tests/system/rpz/tests.sh                        SH      2011,2012
+./bin/tests/system/rpz/Makefile.in             MAKE    2011,2012,2013
+./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013
+./bin/tests/system/rpz/ns1/named.conf          CONF-C  2011,2013
+./bin/tests/system/rpz/ns1/root.db             ZONE    2011,2012,2013
+./bin/tests/system/rpz/ns2/base-tld2s.db       ZONE    2012,2013
+./bin/tests/system/rpz/ns2/hints               ZONE    2011,2013
+./bin/tests/system/rpz/ns2/named.conf          CONF-C  2011,2012,2013
+./bin/tests/system/rpz/ns2/tld2.db             ZONE    2011,2012,2013
+./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012,2013
+./bin/tests/system/rpz/ns3/crash1              X       2011,2013
+./bin/tests/system/rpz/ns3/crash2              X       2011,2012,2013
+./bin/tests/system/rpz/ns3/hints               ZONE    2011,2013
+./bin/tests/system/rpz/ns3/named.conf          CONF-C  2011,2012,2013
+./bin/tests/system/rpz/ns4/hints               ZONE    2011,2013
+./bin/tests/system/rpz/ns4/named.conf          CONF-C  2011,2012,2013
+./bin/tests/system/rpz/ns4/tld4.db             ZONE    2011,2012,2013
+./bin/tests/system/rpz/ns5/hints               ZONE    2011,2012,2013
+./bin/tests/system/rpz/ns5/named.args          X       2013
+./bin/tests/system/rpz/ns5/named.conf          CONF-C  2012,2013
+./bin/tests/system/rpz/ns5/tld5.db             ZONE    2013
+./bin/tests/system/rpz/qperf.sh                        SH      2012,2013
+./bin/tests/system/rpz/rpz.c                   C       2011,2012,2013
+./bin/tests/system/rpz/setup.sh                        SH      2011,2012,2013
+./bin/tests/system/rpz/test1                   ZONE    2011,2012,2013
+./bin/tests/system/rpz/test2                   ZONE    2011,2012,2013
+./bin/tests/system/rpz/test3                   ZONE    2011,2013
+./bin/tests/system/rpz/test4                   ZONE    2011,2013
+./bin/tests/system/rpz/test4a                  ZONE    2013
+./bin/tests/system/rpz/test5                   ZONE    2011,2012,2013
+./bin/tests/system/rpz/tests.sh                        SH      2011,2012,2013
 ./bin/tests/system/rrsetorder/clean.sh         SH      2006,2007,2008,2011,2012
 ./bin/tests/system/rrsetorder/dig.out.fixed.good       X       2006
 ./bin/tests/system/rrsetorder/dig.out.random.good1     X       2006
@@ -1652,7 +1655,6 @@
 ./contrib/dlz/example/Makefile                 X       2010,2013
 ./contrib/dlz/example/README                   X       2011,2013
 ./contrib/dlz/example/dlz_example.c            X       2010,2011,2012,2013
-./contrib/dlz/example/dlz_minimal.h            X       2010,2011,2012
 ./contrib/dlz/example/named.conf               X       2011
 ./contrib/dlz/example/win32/DLLMain.c          X       2011
 ./contrib/dlz/example/win32/dxdriver.def       X       2011
@@ -2128,7 +2130,7 @@
 ./doc/misc/ipv6                                        TXT.BRIEF       2000,2001,2004
 ./doc/misc/migration                           TXT.BRIEF       2000,2001,2003,2004,2007,2008
 ./doc/misc/migration-4to9                      TXT.BRIEF       2001,2004
-./doc/misc/options                             X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./doc/misc/options                             X       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./doc/misc/rfc-compliance                      TXT.BRIEF       2001,2004
 ./doc/misc/roadmap                             TXT.BRIEF       2000,2001,2004
 ./doc/misc/sdb                                 TXT.BRIEF       2000,2001,2004
@@ -2200,7 +2202,7 @@
 ./lib/dns/client.c                             C       2009,2010,2011,2012
 ./lib/dns/clientinfo.c                         C       2011
 ./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/db.c                                 C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013
 ./lib/dns/dbiterator.c                         C       1999,2000,2001,2004,2005,2007
 ./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
@@ -2237,7 +2239,7 @@
 ./lib/dns/include/dns/client.h                 C       2009
 ./lib/dns/include/dns/clientinfo.h             C       2011
 ./lib/dns/include/dns/compress.h               C       1999,2000,2001,2002,2004,2005,2006,2007,2009
-./lib/dns/include/dns/db.h                     C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012
+./lib/dns/include/dns/db.h                     C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013
 ./lib/dns/include/dns/dbiterator.h             C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/dbtable.h                        C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/diff.h                   C       2000,2001,2004,2005,2006,2007,2008,2009,2010
@@ -2285,7 +2287,7 @@
 ./lib/dns/include/dns/resolver.h               C       1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
 ./lib/dns/include/dns/result.h                 C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/include/dns/rootns.h                 C       1999,2000,2001,2004,2005,2006,2007
-./lib/dns/include/dns/rpz.h                    C       2011,2012
+./lib/dns/include/dns/rpz.h                    C       2011,2012,2013
 ./lib/dns/include/dns/rriterator.h             C       2009,2011
 ./lib/dns/include/dns/sdb.h                    C       2000,2001,2004,2005,2006,2007,2009,2011,2012
 ./lib/dns/include/dns/sdlz.h                   C.PORTION       1999,2000,2001,2005,2006,2007,2009,2010,2011,2012
@@ -2305,7 +2307,7 @@
 ./lib/dns/include/dns/update.h                 C       2011
 ./lib/dns/include/dns/validator.h              C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2013
 ./lib/dns/include/dns/version.h                        C       2001,2004,2005,2006,2007
-./lib/dns/include/dns/view.h                   C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./lib/dns/include/dns/view.h                   C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/include/dns/xfrin.h                  C       1999,2000,2001,2003,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/zone.h                   C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/include/dns/zonekey.h                        C       2001,2004,2005,2006,2007
@@ -2401,7 +2403,7 @@
 ./lib/dns/rdata/generic/mr_9.h                 C       1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/mx_15.c                        C       1998,1999,2000,2001,2003,2004,2005,2007,2009,2012
 ./lib/dns/rdata/generic/mx_15.h                        C       1998,1999,2000,2001,2004,2005,2007
-./lib/dns/rdata/generic/naptr_35.c             C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012
+./lib/dns/rdata/generic/naptr_35.c             C       1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013
 ./lib/dns/rdata/generic/naptr_35.h             C       1999,2000,2001,2004,2005,2007,2011,2012
 ./lib/dns/rdata/generic/nid_104.c              C       2013
 ./lib/dns/rdata/generic/nid_104.h              C       2013
@@ -2484,7 +2486,7 @@
 ./lib/dns/resolver.c                           C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/result.c                             C       1998,1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/rootns.c                             C       1999,2000,2001,2002,2004,2005,2007,2008,2010,2012
-./lib/dns/rpz.c                                        C       2011,2012
+./lib/dns/rpz.c                                        C       2011,2012,2013
 ./lib/dns/rriterator.c                         C       2009,2011,2012
 ./lib/dns/sdb.c                                        C       2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
 ./lib/dns/sdlz.c                               C.PORTION       1999,2000,2001,2005,2006,2007,2008,2009,2010,2011,2012
@@ -2577,9 +2579,9 @@
 ./lib/export/irs/Makefile.in                   MAKE    2009,2011,2012
 ./lib/export/irs/include/Makefile.in           MAKE    2009,2011,2012
 ./lib/export/irs/include/irs/Makefile.in       MAKE    2009,2012
-./lib/export/isc/Makefile.in                   MAKE    2009,2010,2012
+./lib/export/isc/Makefile.in                   MAKE    2009,2010,2012,2013
 ./lib/export/isc/include/Makefile.in           MAKE    2009,2011,2012
-./lib/export/isc/include/isc/Makefile.in       MAKE    2009,2012
+./lib/export/isc/include/isc/Makefile.in       MAKE    2009,2012,2013
 ./lib/export/isc/include/isc/bind9.h           C       2009
 ./lib/export/isc/nls/Makefile.in               MAKE    2009,2012
 ./lib/export/isc/nothreads/Makefile.in         MAKE    2009,2010,2012
@@ -2653,7 +2655,7 @@
 ./lib/isc/ia64/include/isc/Makefile.in         MAKE    2007,2012
 ./lib/isc/ia64/include/isc/atomic.h            C       2006,2007,2009,2012
 ./lib/isc/include/Makefile.in                  MAKE    1998,1999,2000,2001,2004,2007,2012
-./lib/isc/include/isc/Makefile.in              MAKE    1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012
+./lib/isc/include/isc/Makefile.in              MAKE    1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013
 ./lib/isc/include/isc/app.h                    C       1999,2000,2001,2004,2005,2006,2007,2009
 ./lib/isc/include/isc/assertions.h             C       1997,1998,1999,2000,2001,2004,2005,2006,2007,2008,2009
 ./lib/isc/include/isc/backtrace.h              C       2009
@@ -2709,7 +2711,8 @@
 ./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
-./lib/isc/include/isc/region.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007
+./lib/isc/include/isc/regex.h                  C       2013
+./lib/isc/include/isc/region.h                 C       1998,1999,2000,2001,2002,2004,2005,2006,2007,2013
 ./lib/isc/include/isc/resource.h               C       2000,2001,2004,2005,2006,2007,2008
 ./lib/isc/include/isc/result.h                 C       1998,1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2012
 ./lib/isc/include/isc/resultclass.h            C       1999,2000,2001,2004,2005,2006,2007,2009
@@ -2789,6 +2792,7 @@
 ./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
+./lib/isc/regex.c                              C       2013
 ./lib/isc/region.c                             C       2002,2004,2005,2007
 ./lib/isc/result.c                             C       1998,1999,2000,2001,2003,2004,2005,2007,2008,2012
 ./lib/isc/rwlock.c                             C       1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2012
@@ -2817,6 +2821,7 @@
 ./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/regex_test.c                   C       2013
 ./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,2013
@@ -2977,7 +2982,7 @@
 ./lib/isccfg/include/isccfg/namedconf.h                C       2002,2004,2005,2006,2007,2009,2010
 ./lib/isccfg/include/isccfg/version.h          C       2001,2004,2005,2006,2007
 ./lib/isccfg/log.c                             C       2001,2004,2005,2006,2007
-./lib/isccfg/namedconf.c                       C       2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./lib/isccfg/namedconf.c                       C       2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/isccfg/parser.c                          C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/isccfg/version.c                         C       1998,1999,2000,2001,2004,2005,2007
 ./lib/isccfg/win32/DLLMain.c                   C       2001,2004,2007