Commit 2ea47c7f authored by Evan Hunt's avatar Evan Hunt Committed by Witold Krecicki

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

parent 4f9c7188
......@@ -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 \
......
; 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
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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
#
......
......@@ -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
......
......@@ -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;
......
......@@ -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);
}
/*
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment