update

diff --git a/util/copyrights b/util/copyrights
index 4de0bfe13056e3179ceeb59414e1f5f90e190a2f..b9deb90164ba4ca4b0a6acb3d0c8f99afcc477a2 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -251,7 +251,7 @@
 ./bin/named/include/named/statschannel.h       C       2008
 ./bin/named/include/named/tkeyconf.h           C       1999,2000,2001,2004,2005,2006,2007
 ./bin/named/include/named/tsigconf.h           C       1999,2000,2001,2004,2005,2006,2007,2009
-./bin/named/include/named/types.h              C       1999,2000,2001,2004,2005,2006,2007,2008,2009
+./bin/named/include/named/types.h              C       1999,2000,2001,2004,2005,2006,2007,2008,2009,2015
 ./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,2015
@@ -988,15 +988,15 @@
 ./bin/tests/system/common/rndc.key             CONF-C  2011,2013
 ./bin/tests/system/common/root.hint            ZONE    2000,2001,2004,2007
 ./bin/tests/system/conf.sh.in                  SH      2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
-./bin/tests/system/cookie/.gitignore           X       2014
-./bin/tests/system/cookie/bad-sit-badhex.conf  CONF-C  2014
-./bin/tests/system/cookie/bad-sit-toolong.conf CONF-C  2014
-./bin/tests/system/cookie/clean.sh             SH      2014
-./bin/tests/system/cookie/ns1/example.db       ZONE    2014
-./bin/tests/system/cookie/ns1/named.conf       CONF-C  2014
-./bin/tests/system/cookie/ns1/root.hint                ZONE    2014
-./bin/tests/system/cookie/ns2/named.conf       CONF-C  2014
-./bin/tests/system/cookie/ns2/root.db          ZONE    2014
+./bin/tests/system/cookie/.gitignore           X       2014,2015
+./bin/tests/system/cookie/bad-cookie-badhex.conf       CONF-C  2014
+./bin/tests/system/cookie/bad-cookie-toolong.conf      CONF-C  2014
+./bin/tests/system/cookie/clean.sh             SH      2014,2015
+./bin/tests/system/cookie/ns1/example.db       ZONE    2014,2015
+./bin/tests/system/cookie/ns1/named.conf       CONF-C  2014,2015
+./bin/tests/system/cookie/ns1/root.hint                ZONE    2014,2015
+./bin/tests/system/cookie/ns2/named.conf       CONF-C  2014,2015
+./bin/tests/system/cookie/ns2/root.db          ZONE    2014,2015
 ./bin/tests/system/cookie/prereq.sh.in         SH      2014
 ./bin/tests/system/cookie/tests.sh             SH      2014,2015
 ./bin/tests/system/coverage/01-ksk-inactive/README     X       2013
@@ -1328,7 +1328,7 @@
 ./bin/tests/system/formerr/noquestions         X       2013
 ./bin/tests/system/formerr/ns1/named.conf      CONF-C  2013
 ./bin/tests/system/formerr/ns1/root.db         ZONE    2013
-./bin/tests/system/formerr/tests.sh            SH      2013
+./bin/tests/system/formerr/tests.sh            SH      2013,2015
 ./bin/tests/system/formerr/twoquestions                X       2013
 ./bin/tests/system/forward/clean.sh            SH      2000,2001,2004,2007,2012,2014
 ./bin/tests/system/forward/ns1/example.db      X       2000,2001
@@ -1798,9 +1798,13 @@
 ./bin/tests/system/rpzrecurse/ns2/.gitignore   X       2015
 ./bin/tests/system/rpzrecurse/ns2/db.clientip1 ZONE    2015
 ./bin/tests/system/rpzrecurse/ns2/db.clientip2 ZONE    2015
+./bin/tests/system/rpzrecurse/ns2/db.log1      ZONE    2015
+./bin/tests/system/rpzrecurse/ns2/db.log2      ZONE    2015
+./bin/tests/system/rpzrecurse/ns2/db.log3      ZONE    2015
 ./bin/tests/system/rpzrecurse/ns2/named.clientip.conf  CONF-C  2015
 ./bin/tests/system/rpzrecurse/ns2/named.conf.header    CONF-C  2015
 ./bin/tests/system/rpzrecurse/ns2/named.default.conf   CONF-C  2015
+./bin/tests/system/rpzrecurse/ns2/named.log.conf       CONF-C  2015
 ./bin/tests/system/rpzrecurse/ns2/root.hint    ZONE    2015
 ./bin/tests/system/rpzrecurse/prereq.sh                SH      2015
 ./bin/tests/system/rpzrecurse/setup.sh         SH      2015
@@ -3091,7 +3095,7 @@
 ./lib/dns/include/dns/Makefile.in              MAKE    1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013,2014
 ./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,2014
-./lib/dns/include/dns/adb.h                    C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014
+./lib/dns/include/dns/adb.h                    C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015
 ./lib/dns/include/dns/badcache.h               C       2014
 ./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
@@ -3113,7 +3117,7 @@
 ./lib/dns/include/dns/ds.h                     C       2002,2004,2005,2006,2007,2010,2012,2014
 ./lib/dns/include/dns/dsdigest.h               C       2012
 ./lib/dns/include/dns/ecdb.h                   C       2009,2012
-./lib/dns/include/dns/edns.h                   C       2014
+./lib/dns/include/dns/edns.h                   C       2014,2015
 ./lib/dns/include/dns/events.h                 C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2014
 ./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,2013
@@ -3137,7 +3141,7 @@
 ./lib/dns/include/dns/nta.h                    C       2014,2015
 ./lib/dns/include/dns/opcode.h                 C       2002,2004,2005,2006,2007
 ./lib/dns/include/dns/order.h                  C       2002,2004,2005,2006,2007
-./lib/dns/include/dns/peer.h                   C       2000,2001,2003,2004,2005,2006,2007,2008,2009,2013,2014
+./lib/dns/include/dns/peer.h                   C       2000,2001,2003,2004,2005,2006,2007,2008,2009,2013,2014,2015
 ./lib/dns/include/dns/portlist.h               C       2003,2004,2005,2006,2007
 ./lib/dns/include/dns/private.h                        C       2009,2011,2012
 ./lib/dns/include/dns/rbt.h                    C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015
@@ -3162,7 +3166,7 @@
 ./lib/dns/include/dns/secproto.h               C       1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/soa.h                    C       2000,2001,2004,2005,2006,2007,2009
 ./lib/dns/include/dns/ssu.h                    C       2000,2001,2003,2004,2005,2006,2007,2008,2010,2011
-./lib/dns/include/dns/stats.h                  C       2000,2001,2004,2005,2006,2007,2008,2009,2012,2014
+./lib/dns/include/dns/stats.h                  C       2000,2001,2004,2005,2006,2007,2008,2009,2012,2014,2015
 ./lib/dns/include/dns/tcpmsg.h                 C       1999,2000,2001,2004,2005,2006,2007,2015
 ./lib/dns/include/dns/time.h                   C       1999,2000,2001,2004,2005,2006,2007,2012
 ./lib/dns/include/dns/timer.h                  C       2000,2001,2004,2005,2006,2007
@@ -3208,7 +3212,7 @@
 ./lib/dns/opensslgost_link.c                   C       2010,2011,2012,2013,2014
 ./lib/dns/opensslrsa_link.c                    C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015
 ./lib/dns/order.c                              C       2002,2004,2005,2007
-./lib/dns/peer.c                               C       2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014
+./lib/dns/peer.c                               C       2000,2001,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015
 ./lib/dns/pkcs11.c                             C       2014
 ./lib/dns/pkcs11dh_link.c                      C       2014
 ./lib/dns/pkcs11dsa_link.c                     C       2014
@@ -3222,7 +3226,7 @@
 ./lib/dns/rbtdb.h                              C       1999,2000,2001,2004,2005,2007,2011,2012
 ./lib/dns/rbtdb64.c                            C       1999,2000,2001,2004,2005,2007
 ./lib/dns/rbtdb64.h                            C       1999,2000,2001,2004,2005,2007
-./lib/dns/rcode.c                              C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
+./lib/dns/rcode.c                              C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/rdata.c                              C       1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
 ./lib/dns/rdata/any_255/tsig_250.c             C       1999,2000,2001,2002,2003,2004,2005,2007,2009,2011,2012
 ./lib/dns/rdata/any_255/tsig_250.h             C       1999,2000,2001,2004,2005,2007
@@ -3306,7 +3310,7 @@
 ./lib/dns/rdata/generic/nxt_30.h               C       1999,2000,2001,2002,2004,2005,2007
 ./lib/dns/rdata/generic/openpgpkey_61.c                C       2014
 ./lib/dns/rdata/generic/openpgpkey_61.h                C       2014
-./lib/dns/rdata/generic/opt_41.c               C       1998,1999,2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014
+./lib/dns/rdata/generic/opt_41.c               C       1998,1999,2000,2001,2002,2004,2005,2007,2009,2011,2012,2013,2014,2015
 ./lib/dns/rdata/generic/opt_41.h               C       1998,1999,2000,2001,2004,2005,2007
 ./lib/dns/rdata/generic/proforma.c             C       1998,1999,2000,2001,2002,2004,2007,2009
 ./lib/dns/rdata/generic/proforma.h             C       1998,1999,2000,2001,2004,2005,2007
@@ -3410,7 +3414,7 @@
 ./lib/dns/tests/private_test.c                 C       2011,2012
 ./lib/dns/tests/rbt_serialize_test.c           C       2014,2015
 ./lib/dns/tests/rbt_test.c                     C       2012,2013,2014,2015
-./lib/dns/tests/rdata_test.c                   C       2012,2013
+./lib/dns/tests/rdata_test.c                   C       2012,2013,2015
 ./lib/dns/tests/rdataset_test.c                        C       2012
 ./lib/dns/tests/rdatasetstats_test.c           C       2012,2015
 ./lib/dns/tests/testdata/dbiterator/zone1.data ZONE    2011,2012
@@ -3815,7 +3819,7 @@
 ./lib/isc/win32/include/isc/ntpaths.h          C       2000,2001,2004,2007,2009,2015
 ./lib/isc/win32/include/isc/offset.h           C       2000,2001,2004,2007
 ./lib/isc/win32/include/isc/once.h             C       1999,2000,2001,2004,2007
-./lib/isc/win32/include/isc/platform.h.in      C       2001,2004,2005,2007,2008,2009,2013,2014
+./lib/isc/win32/include/isc/platform.h.in      C       2001,2004,2005,2007,2008,2009,2013,2014,2015
 ./lib/isc/win32/include/isc/stat.h             C       2000,2001,2003,2004,2007,2009,2012
 ./lib/isc/win32/include/isc/stdtime.h          C       1999,2000,2001,2004,2005,2007,2011,2012
 ./lib/isc/win32/include/isc/strerror.h         C       2001,2004,2007