reduce MAX_RESTARTS to 11

the number of steps that can be followed in a CNAME chain
before terminating the lookup has been reduced from 16 to 11.
(this is a hard-coded value, but will be made configurable later.)

(cherry picked from commit 05d78671bb6a5ba63d78d77339e17cbc73f18188)

diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh
index 6330dafdc806ada273329f0134f260bbc127c2c5..49a18356cacadb8768a2a7662aa616cc3615ceef 100644 (file)
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@@ -454,7 +454,7 @@ ret=0
 $DIG $DIGOPTS @10.53.0.2 loop.example >dig.out.test$n
 grep "status: SERVFAIL" dig.out.test$n >/dev/null || ret=1
 grep "max. restarts reached" dig.out.test$n >/dev/null || ret=1
-grep "ANSWER: 17" dig.out.test$n >/dev/null || ret=1
+grep "ANSWER: 12" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 2a3774675b5dbfa77a0f1ee9d9c8ad2614132c75..d74b1be6d5d3bfe162528f583a5ea051132d45a8 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -229,7 +229,7 @@ dig_with_opts +tcp longcname1.example.net @10.53.0.1 a >dig.out.ns1.test${n} ||
 grep -F "status: SERVFAIL" dig.out.ns1.test${n} >/dev/null || ret=1
 grep -F "max. restarts reached" dig.out.ns1.test${n} >/dev/null || ret=1
 lines=$(grep -F "CNAME" dig.out.ns1.test${n} | wc -l)
-test ${lines:-1} -eq 17 || ret=1
+test ${lines:-1} -eq 12 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 9d8eb87e00ba8cee8767c90d33313997beeb9984..7ac358df020b4eb555a665e12477d8fb43afc4b0 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -60,7 +60,7 @@
 #define UCTX_MAGIC    ISC_MAGIC('U', 'c', 't', 'x')
 #define UCTX_VALID(c) ISC_MAGIC_VALID(c, UCTX_MAGIC)
 
-#define MAX_RESTARTS 16
+#define MAX_RESTARTS 11
 
 #ifdef TUNE_LARGE
 #define RESOLVER_NTASKS 523

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 866ea9d50904274ae568dedce20d685ed3bed5b2..b712fe2fb2ef1aac4c67397d55dc134943681434 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -89,7 +89,7 @@
  * Maximum number of chained queries before we give up
  * to prevent CNAME loops.
  */
-#define MAX_RESTARTS 16
+#define MAX_RESTARTS 11
 
 #define QUERY_ERROR(qctx, r)                  \
        do {                                  \