[master] copyrights

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 001499e3441493b47657ab4ce448a38b378e5042..b8b76f7359bc587acd2a7523e24284168ff51279 100644 (file)
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -43,7 +43,7 @@
 #include <named/main.h>
 #include <named/os.h>
 #ifdef HAVE_LIBSCF
-#include <named/named_smf_globals.h>
+#include <named/smf_globals.h>
 #endif
 
 static char *pidfile = NULL;

diff --git a/bin/tests/system/rpz/fastrpz.license b/bin/tests/system/rpz/fastrpz.license
deleted file mode 100644 (file)
index 634c553..0000000
--- a/bin/tests/system/rpz/fastrpz.license
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME='isc.license.fastrpz.com'
-KEY='hmac-sha256:farsight_fastrpz_license:f405d02b4c8af54855fcebc1'
-LSERVER=license1.fastrpz.com

diff --git a/util/copyrights b/util/copyrights
index 72197da9177c8aa16776c1f18bb217e172648345..ed2ec05ddde7b48e425bea1581322ac4a4dae077 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -706,7 +706,7 @@
 ./bin/tests/system/allow_query/ns2/previous.db ZONE    2010,2016
 ./bin/tests/system/allow_query/setup.sh                SH      2010,2012,2016
 ./bin/tests/system/allow_query/tests.sh                SH      2010,2012,2013,2016
-./bin/tests/system/ans.pl                      PERL    2011,2012,2014,2016
+./bin/tests/system/ans.pl                      PERL    2011,2012,2014,2016,2017
 ./bin/tests/system/autosign/clean.sh           SH      2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/autosign/ns1/keygen.sh      SH      2009,2010,2011,2012,2014,2016,2017
 ./bin/tests/system/autosign/ns1/named.conf     CONF-C  2009,2013,2016
@@ -1050,6 +1050,7 @@
 ./bin/tests/system/dialup/setup.sh             SH      2000,2001,2004,2007,2012,2016
 ./bin/tests/system/dialup/tests.sh             SH      2000,2001,2004,2007,2012,2016
 ./bin/tests/system/digcomp.pl                  PERL    2000,2001,2004,2007,2012,2013,2016
+./bin/tests/system/digdelv/ans4/startme                X       2017
 ./bin/tests/system/digdelv/clean.sh            SH      2015,2016
 ./bin/tests/system/digdelv/ns1/named.conf      CONF-C  2015,2016
 ./bin/tests/system/digdelv/ns1/root.db         ZONE    2015,2016
@@ -1439,7 +1440,7 @@
 ./bin/tests/system/forward/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016
 ./bin/tests/system/forward/ula-inherited.conf  CONF-C  2016
 ./bin/tests/system/forward/ula-notinherited.conf       CONF-C  2016
-./bin/tests/system/genzone.sh                  SH      2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016
+./bin/tests/system/genzone.sh                  SH      2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/geoip/clean.sh              SH      2013,2014,2016
 ./bin/tests/system/geoip/data/GeoIP.csv                X       2013,2014
 ./bin/tests/system/geoip/data/GeoIP.dat                X       2013,2014
@@ -1917,7 +1918,13 @@
 ./bin/tests/system/rndc/ns6/named.conf.in      CONF-C  2016
 ./bin/tests/system/rndc/setup.sh               SH      2011,2012,2013,2014,2016,2017
 ./bin/tests/system/rndc/tests.sh               SH      2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014,2016
+./bin/tests/system/rpz/.gitignore              X       2017
+./bin/tests/system/rpz/Makefile.in             MAKE    2017
+./bin/tests/system/rpz/ckdnsrps.sh             SH      2017
+./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014,2016,2017
+./bin/tests/system/rpz/dnsrps.c                        C       2017
+./bin/tests/system/rpz/dnsrpzd-license.conf    X       2017
+./bin/tests/system/rpz/dnsrpzd.conf            CONF-C  2017
 ./bin/tests/system/rpz/ns1/named.conf          CONF-C  2011,2013,2016,2017
 ./bin/tests/system/rpz/ns1/root.db             ZONE    2011,2012,2013,2016
 ./bin/tests/system/rpz/ns2/base-tld2s.db       ZONE    2012,2013,2016
@@ -1927,7 +1934,7 @@
 ./bin/tests/system/rpz/ns2/hints               ZONE    2011,2013,2016
 ./bin/tests/system/rpz/ns2/named.conf          CONF-C  2011,2012,2013,2016,2017
 ./bin/tests/system/rpz/ns2/tld2.db             ZONE    2011,2012,2013,2016
-./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012,2013,2016
+./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012,2013,2016,2017
 ./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,2016
@@ -1939,7 +1946,7 @@
 ./bin/tests/system/rpz/ns5/hints               ZONE    2011,2012,2013,2016
 ./bin/tests/system/rpz/ns5/named.args          X       2013,2014
 ./bin/tests/system/rpz/ns5/named.conf          CONF-C  2012,2013,2014,2016,2017
-./bin/tests/system/rpz/ns5/tld5.db             ZONE    2013,2016
+./bin/tests/system/rpz/ns5/tld5.db             ZONE    2013,2016,2017
 ./bin/tests/system/rpz/ns6/hints               ZONE    2014,2016
 ./bin/tests/system/rpz/ns6/named.conf          CONF-C  2014,2016,2017
 ./bin/tests/system/rpz/ns7/hints               ZONE    2014,2016
@@ -1949,8 +1956,8 @@
 ./bin/tests/system/rpz/setup.sh                        SH      2011,2012,2013,2014,2016,2017
 ./bin/tests/system/rpz/test1                   ZONE    2011,2012,2013,2016
 ./bin/tests/system/rpz/test2                   ZONE    2011,2012,2013,2016
-./bin/tests/system/rpz/test3                   ZONE    2011,2013,2016
-./bin/tests/system/rpz/test4                   ZONE    2011,2013,2016
+./bin/tests/system/rpz/test3                   ZONE    2011,2013,2016,2017
+./bin/tests/system/rpz/test4                   ZONE    2011,2013,2016,2017
 ./bin/tests/system/rpz/test4a                  ZONE    2013,2016
 ./bin/tests/system/rpz/test5                   ZONE    2011,2012,2013,2016
 ./bin/tests/system/rpz/test6                   ZONE    2013,2016
@@ -1958,11 +1965,11 @@
 ./bin/tests/system/rpzrecurse/.gitignore       X       2015
 ./bin/tests/system/rpzrecurse/README           TXT.BRIEF       2015,2016
 ./bin/tests/system/rpzrecurse/ans5/ans.pl      PERL    2016
-./bin/tests/system/rpzrecurse/clean.sh         SH      2015,2016
+./bin/tests/system/rpzrecurse/clean.sh         SH      2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns1/db.l0                ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/db.l1.l0     ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/example.db   ZONE    2015,2016
-./bin/tests/system/rpzrecurse/ns1/named.conf   CONF-C  2015,2016
+./bin/tests/system/rpzrecurse/ns1/named.conf   CONF-C  2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns1/root.db      ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/test1.example.net.db ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns1/test2.example.net.db ZONE    2015,2016
@@ -1977,25 +1984,25 @@
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard2a        ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard2b        ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard3 ZONE    2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.clientip.conf  CONF-C  2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.clientip2.conf CONF-C  2016
-./bin/tests/system/rpzrecurse/ns2/named.conf.header    CONF-C  2015,2016
+./bin/tests/system/rpzrecurse/ns2/named.clientip.conf  CONF-C  2015,2016,2017
+./bin/tests/system/rpzrecurse/ns2/named.clientip2.conf CONF-C  2016,2017
+./bin/tests/system/rpzrecurse/ns2/named.conf.header    CONF-C  2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns2/named.default.conf   CONF-C  2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.log.conf       CONF-C  2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf CONF-C  2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf CONF-C  2015,2016
-./bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf CONF-C  2015,2016
+./bin/tests/system/rpzrecurse/ns2/named.log.conf       CONF-C  2015,2016,2017
+./bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf CONF-C  2015,2016,2017
+./bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf CONF-C  2015,2016,2017
+./bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf CONF-C  2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns2/root.hint    ZONE    2015,2016
 ./bin/tests/system/rpzrecurse/ns3/example.db   ZONE    2016
-./bin/tests/system/rpzrecurse/ns3/named1.conf  CONF-C  2016
-./bin/tests/system/rpzrecurse/ns3/named2.conf  CONF-C  2016
+./bin/tests/system/rpzrecurse/ns3/named1.conf  CONF-C  2016,2017
+./bin/tests/system/rpzrecurse/ns3/named2.conf  CONF-C  2016,2017
 ./bin/tests/system/rpzrecurse/ns3/policy.db    ZONE    2016
 ./bin/tests/system/rpzrecurse/ns3/root.db      ZONE    2016
 ./bin/tests/system/rpzrecurse/ns4/child.example.db     ZONE    2016
-./bin/tests/system/rpzrecurse/ns4/named.conf   CONF-C  2016
-./bin/tests/system/rpzrecurse/prereq.sh                SH      2015,2016
-./bin/tests/system/rpzrecurse/setup.sh         SH      2015,2016
-./bin/tests/system/rpzrecurse/testgen.pl       PERL    2015,2016
+./bin/tests/system/rpzrecurse/ns4/named.conf   CONF-C  2016,2017
+./bin/tests/system/rpzrecurse/prereq.sh                SH      2015,2016,2017
+./bin/tests/system/rpzrecurse/setup.sh         SH      2015,2016,2017
+./bin/tests/system/rpzrecurse/testgen.pl       PERL    2015,2016,2017
 ./bin/tests/system/rpzrecurse/tests.sh         SH      2015,2016,2017
 ./bin/tests/system/rrchecker/classlist.good    X       2013
 ./bin/tests/system/rrchecker/clean.sh          SH      2013,2014,2016,2017
@@ -2420,7 +2427,7 @@
 ./bin/tests/system/zero/ns4/named.conf         CONF-C  2013,2016,2017
 ./bin/tests/system/zero/ns4/one.tld.db         ZONE    2016
 ./bin/tests/system/zero/setup.sh               SH      2013,2014,2016
-./bin/tests/system/zero/tests.sh               SH      2013,2016
+./bin/tests/system/zero/tests.sh               SH      2013,2016,2017
 ./bin/tests/system/zonechecks/a.db             ZONE    2004,2007,2016
 ./bin/tests/system/zonechecks/aaaa.db          ZONE    2004,2007,2016
 ./bin/tests/system/zonechecks/bigserial.db     ZONE    2015,2016
@@ -3356,6 +3363,7 @@
 ./lib/dns/dispatch.c                           C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/dlz.c                                        C.PORTION       1999,2000,2001,2005,2007,2009,2010,2011,2012,2013,2015,2016
 ./lib/dns/dns64.c                              C       2010,2011,2014,2016,2017
+./lib/dns/dnsrps.c                             C       2017
 ./lib/dns/dnssec.c                             C       1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/dnstap.c                             C       2015,2016,2017
 ./lib/dns/dnstap.proto                         X       2015
@@ -3402,6 +3410,7 @@
 ./lib/dns/include/dns/dlz.h                    C.PORTION       1999,2000,2001,2005,2006,2007,2009,2010,2011,2012,2013,2016
 ./lib/dns/include/dns/dlz_dlopen.h             C       2011,2012,2013,2016
 ./lib/dns/include/dns/dns64.h                  C       2010,2014,2016
+./lib/dns/include/dns/dnsrps.h                 C       2017
 ./lib/dns/include/dns/dnssec.h                 C       1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011,2012,2013,2014,2015,2016
 ./lib/dns/include/dns/dnstap.h                 C       2015,2016,2017
 ./lib/dns/include/dns/ds.h                     C       2002,2004,2005,2006,2007,2010,2012,2014,2016
@@ -3422,6 +3431,7 @@
 ./lib/dns/include/dns/keytable.h               C       2000,2001,2004,2005,2007,2009,2010,2014,2015,2016
 ./lib/dns/include/dns/keyvalues.h              C       1999,2000,2001,2003,2004,2005,2006,2007,2008,2009,2010,2012,2016,2017
 ./lib/dns/include/dns/lib.h                    C       1999,2000,2001,2004,2005,2006,2007,2009,2016,2017
+./lib/dns/include/dns/librpz.h                 C       2017
 ./lib/dns/include/dns/log.h                    C       1999,2000,2001,2003,2004,2005,2006,2007,2009,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/include/dns/lookup.h                 C       2000,2001,2004,2005,2006,2007,2009,2016
 ./lib/dns/include/dns/master.h                 C       1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016
@@ -3600,7 +3610,7 @@
 ./lib/dns/rdata/generic/ninfo_56.h             C       2015,2016
 ./lib/dns/rdata/generic/ns_2.c                 C       1998,1999,2000,2001,2004,2007,2009,2015,2016
 ./lib/dns/rdata/generic/ns_2.h                 C       1998,1999,2000,2001,2004,2005,2007,2016
-./lib/dns/rdata/generic/nsec3_50.c             C       2008,2009,2011,2012,2014,2015,2016
+./lib/dns/rdata/generic/nsec3_50.c             C       2008,2009,2011,2012,2014,2015,2016,2017
 ./lib/dns/rdata/generic/nsec3_50.h             C       2008,2011,2012,2016
 ./lib/dns/rdata/generic/nsec3param_51.c                C       2008,2009,2015,2016
 ./lib/dns/rdata/generic/nsec3param_51.h                C       2008,2016