rename test to qmin; add it to conf.sh.in and Makefile.in; fix copyrights

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index a552f4667e04325d5485c4e64eedebf39f1c70d5..c17fac83d2151bd6e1a76f3f4d05b1dc6f0334bd 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -64,7 +64,7 @@ PARALLEL = rpzrecurse serve-stale dnssec \
           legacy limits logfileconfig \
           masterfile masterformat metadata mkeys \
           names notify nslookup nsupdate nzd2nzf \
-          padding pending pipelined \
+          padding pending pipelined qmin \
           reclimit redirect resolver rndc rootkeysentinel rpz \
           rrchecker rrl rrsetorder rsabigexponent runtime \
           sfcache smartsign sortlist \

diff --git a/bin/tests/system/additional/ns2/root.db b/bin/tests/system/additional/ns2/root.db
index c5371e111aa2889b9dd9e2a82c6a1fb10b277f63..324124078484c40d4d456605618d4d7567945a0f 100644 (file)
--- a/bin/tests/system/additional/ns2/root.db
+++ b/bin/tests/system/additional/ns2/root.db
@@ -1,3 +1,12 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
 . IN SOA ns2. hostmaster ( 2 8H 2H 4W 1D);
 . NS ns2.
 ns1. A 10.53.0.1

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index e4d60eaa18a2b7485478716e5010111cc947aca4..1e4f97d106987a71398095adbcca9f9038c596f6 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -95,7 +95,7 @@ PARALLELDIRS="acl additional addzone allow-query auth autosign \
        legacy limits logfileconfig \
        masterfile masterformat metadata mkeys \
        names notify nslookup nsupdate nzd2nzf \
-       padding pending pipelined \
+       padding pending pipelined qmin \
        reclimit redirect resolver rndc rootkeysentinel rpz rpzrecurse \
        rrchecker rrl rrsetorder rsabigexponent runtime \
        serve-stale sfcache smartsign sortlist \

diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index 6bfac1357c0bdb66421432b1c956b561f027fb8a..b178179909be964698c51a1daba2ff36de076f38 100644 (file)
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -91,8 +91,8 @@ SEQUENTIALDIRS="acl additional addzone autosign builtin \
         fetchlimit filter-aaaa formerr forward geoip glue idna inline ixfr \
         keepalive @KEYMGR@ legacy limits logfileconfig masterfile \
         masterformat metadata mkeys names notify nslookup nsupdate \
-        nzd2nzf padding pending pipelined @PKCS11_TEST@ reclimit \
-        redirect resolver rndc rpz rrchecker rrl \
+        nzd2nzf padding pending pipelined @PKCS11_TEST@ qmin
+         reclimit redirect resolver rndc rpz rrchecker rrl \
         rrsetorder rsabigexponent runtime sfcache smartsign sortlist \
         spf staticstub statistics statschannel stub tcp tkey tsig \
         tsiggss unknown upforwd verify views wildcard xfer xferquota \

diff --git a/bin/tests/system/qname-minimization/ans2/ans.py b/bin/tests/system/qmin/ans2/ans.py
similarity index 100%
rename from bin/tests/system/qname-minimization/ans2/ans.py
rename to bin/tests/system/qmin/ans2/ans.py

diff --git a/bin/tests/system/qname-minimization/ans3/ans.py b/bin/tests/system/qmin/ans3/ans.py
similarity index 99%
rename from bin/tests/system/qname-minimization/ans3/ans.py
rename to bin/tests/system/qmin/ans3/ans.py
index d767403da0ce1863071d9263c67858d86382505d..1a0d82e5cee49b270fd491600ce7f2df60def4f4 100755 (executable)
--- a/bin/tests/system/qname-minimization/ans3/ans.py
+++ b/bin/tests/system/qmin/ans3/ans.py
@@ -34,7 +34,7 @@ def logquery(type, qname):
 ############################################################################
 # Respond to a DNS query.
 # For good. it serves:
-# zoop.boing.good. NS ns3.good. 
+# zoop.boing.good. NS ns3.good.
 # icky.ptang.zoop.boing.good. NS a.bit.longer.ns.name.good.
 # it responds properly (with NODATA empty response) to non-empty terminals
 #

diff --git a/bin/tests/system/qname-minimization/ans4/ans.py b/bin/tests/system/qmin/ans4/ans.py
similarity index 100%
rename from bin/tests/system/qname-minimization/ans4/ans.py
rename to bin/tests/system/qmin/ans4/ans.py

diff --git a/bin/tests/system/qname-minimization/clean.sh b/bin/tests/system/qmin/clean.sh
similarity index 100%
rename from bin/tests/system/qname-minimization/clean.sh
rename to bin/tests/system/qmin/clean.sh

diff --git a/bin/tests/system/qname-minimization/ns1/named.conf.in b/bin/tests/system/qmin/ns1/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns1/named.conf.in
rename to bin/tests/system/qmin/ns1/named.conf.in

diff --git a/bin/tests/system/qname-minimization/ns1/root.db b/bin/tests/system/qmin/ns1/root.db
similarity index 100%
rename from bin/tests/system/qname-minimization/ns1/root.db
rename to bin/tests/system/qmin/ns1/root.db

diff --git a/bin/tests/system/qname-minimization/ns5/named.conf.in b/bin/tests/system/qmin/ns5/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns5/named.conf.in
rename to bin/tests/system/qmin/ns5/named.conf.in

diff --git a/bin/tests/system/qname-minimization/ns6/named.conf.in b/bin/tests/system/qmin/ns6/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns6/named.conf.in
rename to bin/tests/system/qmin/ns6/named.conf.in

diff --git a/bin/tests/system/qname-minimization/ns7/named.conf.in b/bin/tests/system/qmin/ns7/named.conf.in
similarity index 100%
rename from bin/tests/system/qname-minimization/ns7/named.conf.in
rename to bin/tests/system/qmin/ns7/named.conf.in

diff --git a/bin/tests/system/qname-minimization/setup.sh b/bin/tests/system/qmin/setup.sh
similarity index 100%
rename from bin/tests/system/qname-minimization/setup.sh
rename to bin/tests/system/qmin/setup.sh

diff --git a/bin/tests/system/qname-minimization/tests.sh b/bin/tests/system/qmin/tests.sh
similarity index 99%
rename from bin/tests/system/qname-minimization/tests.sh
rename to bin/tests/system/qmin/tests.sh
index bd06cdd123f61b89e2a5b09f616985a337138718..edd76942aeb64008c325753c2c55501b52738647 100755 (executable)
--- a/bin/tests/system/qname-minimization/tests.sh
+++ b/bin/tests/system/qmin/tests.sh
@@ -89,7 +89,7 @@ grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
 grep "icky.icky.icky.ptang.zoop.boing.good. 1  IN A    192.0.2.1" dig.out.test$n > /dev/null || ret=1
 # Duplicated NS queries are there because we're not creating
 # a separate fetch when doing qname minimization - so two
-# queries running for the same name but different RRTYPE 
+# queries running for the same name but different RRTYPE
 # (A and AAAA in this case) will create separate queries
 # for NSes on the way. Those will be cached though, so it
 # should not be a problem

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index c163053db5fccd3bbd7c937cdb134f88794e1592..adcf733b5185de1735a46e9790482171175624ee 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -4029,7 +4029,7 @@ fetch_name(dns_adbname_t *adbname, isc_boolean_t start_at_zone,
                nameservers = &rdataset;
                options |= DNS_FETCHOPT_UNSHARED;
        }
-       
+
        if (adb->view->qminimization) {
                options |= DNS_FETCHOPT_QMINIMIZE;
                options |= DNS_FETCHOPT_QMIN_SKIP_ON_IP6A;

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 312d8efa16e8d3701c8323c20d08baedac395af0..e1c175349886e4d576d99c65dec5f23beceec795 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -8509,7 +8509,7 @@ rctx_answer_none(respctx_t *rctx) {
                                      DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
                                      "disabling qname minimization for '%s'"
                                      " due to formerr", fctx->info);
-                       fctx->qmin_labels = DNS_MAX_LABELS+1;
+                       fctx->qmin_labels = DNS_MAX_LABELS+1;
                        return rctx_answer_minimized(rctx);
                }
                return (DNS_R_FORMERR);
@@ -8545,7 +8545,7 @@ rctx_answer_none(respctx_t *rctx) {
         * NXDOMAIN we go straight to the full query.
         */
        if (fctx->minimized && !(fctx->options & DNS_FETCHOPT_QMIN_STRICT)) {
-               fctx->qmin_labels = DNS_MAX_LABELS+1;
+               fctx->qmin_labels = DNS_MAX_LABELS+1;
                return rctx_answer_minimized(rctx);
        }
        /*

diff --git a/util/copyrights b/util/copyrights
index 22dbf69854a4736b9919956360af4b0790959710..84bfd1ed006e4ab898215fb24911051a2d93e28c 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -1731,17 +1731,17 @@
 ./bin/tests/system/pkcs11ssl/setup.sh          SH      2014,2016,2018
 ./bin/tests/system/pkcs11ssl/tests.sh          SH      2014,2016,2018
 ./bin/tests/system/pkcs11ssl/usepkcs11         X       2014,2018
-./bin/tests/system/qname-minimization/ans2/ans.py      PYTHON  2018
-./bin/tests/system/qname-minimization/ans3/ans.py      PYTHON  2018
-./bin/tests/system/qname-minimization/ans4/ans.py      PYTHON  2018
-./bin/tests/system/qname-minimization/clean.sh SH      2018
-./bin/tests/system/qname-minimization/ns1/named.conf.in        CONF-C  2018
-./bin/tests/system/qname-minimization/ns1/root.db      ZONE    2018
-./bin/tests/system/qname-minimization/ns5/named.conf.in        CONF-C  2018
-./bin/tests/system/qname-minimization/ns6/named.conf.in        CONF-C  2018
-./bin/tests/system/qname-minimization/ns7/named.conf.in        CONF-C  2018
-./bin/tests/system/qname-minimization/setup.sh SH      2018
-./bin/tests/system/qname-minimization/tests.sh SH      2018
+./bin/tests/system/qmin/ans2/ans.py            PYTHON  2018
+./bin/tests/system/qmin/ans3/ans.py            PYTHON  2018
+./bin/tests/system/qmin/ans4/ans.py            PYTHON  2018
+./bin/tests/system/qmin/clean.sh               SH      2018
+./bin/tests/system/qmin/ns1/named.conf.in      CONF-C  2018
+./bin/tests/system/qmin/ns1/root.db            ZONE    2018
+./bin/tests/system/qmin/ns5/named.conf.in      CONF-C  2018
+./bin/tests/system/qmin/ns6/named.conf.in      CONF-C  2018
+./bin/tests/system/qmin/ns7/named.conf.in      CONF-C  2018
+./bin/tests/system/qmin/setup.sh               SH      2018
+./bin/tests/system/qmin/tests.sh               SH      2018
 ./bin/tests/system/reclimit/README             TXT.BRIEF       2014,2016,2017,2018
 ./bin/tests/system/reclimit/ans2/ans.pl                PERL    2014,2015,2016,2017,2018
 ./bin/tests/system/reclimit/ans7/ans.pl                PERL    2014,2016,2018