From: Evan Hunt Date: Sun, 2 Aug 2015 18:18:12 +0000 (-0700) Subject: [master] add +nocookie options where needed X-Git-Tag: v9.11.0a1~619 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=68116c5a5fd36fef812fc207de3b7714db2994d5;p=thirdparty%2Fbind9.git [master] add +nocookie options where needed --- diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh index 0f672214de4..8a06371c64f 100644 --- a/bin/tests/system/dlzexternal/tests.sh +++ b/bin/tests/system/dlzexternal/tests.sh @@ -22,7 +22,7 @@ SYSTEMTESTTOP=.. status=0 n=0 -DIGOPTS="@10.53.0.1 -p 5300" +DIGOPTS="@10.53.0.1 -p 5300 +nocookie" newtest() { n=`expr $n + 1` diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh index 2047fc2e620..5510f55f292 100644 --- a/bin/tests/system/rrsetorder/tests.sh +++ b/bin/tests/system/rrsetorder/tests.sh @@ -17,6 +17,9 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +DIGOPTS="+nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short +nocookie" +DIGCMD="$DIG $DIGOPTS -p 5300" + status=0 if grep "^#define DNS_RDATASET_FIXED" $TOP/config.h > /dev/null 2>&1 ; then @@ -34,8 +37,7 @@ if $test_fixed; then ret=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 do - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.1 fixed.example > dig.out.fixed || ret=1 + $DIGCMD @10.53.0.1 fixed.example > dig.out.fixed || ret=1 cmp -s dig.out.fixed dig.out.fixed.good || ret=1 done if [ $ret != 0 ]; then echo "I:failed"; fi @@ -47,8 +49,7 @@ else for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.1 fixed.example > dig.out.fixed || ret=1 + $DIGCMD @10.53.0.1 fixed.example > dig.out.fixed || ret=1 if [ $i -le 4 ]; then cp dig.out.fixed dig.out.$j else @@ -75,8 +76,7 @@ matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.1 cyclic.example > dig.out.cyclic || ret=1 + $DIGCMD @10.53.0.1 cyclic.example > dig.out.cyclic || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic dig.out.$j else @@ -102,8 +102,7 @@ matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.1 cyclic2.example > dig.out.cyclic2 || ret=1 + $DIGCMD @10.53.0.1 cyclic2.example > dig.out.cyclic2 || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic2 dig.out.$j else @@ -127,8 +126,7 @@ do done for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 do -$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.1 random.example > dig.out.random || ret=1 + $DIGCMD @10.53.0.1 random.example > dig.out.random || ret=1 match=0 for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 do @@ -155,8 +153,7 @@ if $test_fixed; then ret=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 do - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 fixed.example > dig.out.fixed || ret=1 + $DIGCMD @10.53.0.2 fixed.example > dig.out.fixed || ret=1 cmp -s dig.out.fixed dig.out.fixed.good || ret=1 done if [ $ret != 0 ]; then echo "I:failed"; fi @@ -172,8 +169,7 @@ matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1 + $DIGCMD @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic dig.out.$j else @@ -199,8 +195,7 @@ matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 cyclic2.example > dig.out.cyclic2 || ret=1 + $DIGCMD @10.53.0.2 cyclic2.example > dig.out.cyclic2 || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic2 dig.out.$j else @@ -225,8 +220,7 @@ do done for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 do -$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 random.example > dig.out.random || ret=1 +$DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1 match=0 for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 do @@ -269,8 +263,7 @@ if $test_fixed; then ret=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 do - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 fixed.example > dig.out.fixed || ret=1 + $DIGCMD @10.53.0.2 fixed.example > dig.out.fixed || ret=1 cmp -s dig.out.fixed dig.out.fixed.good || ret=1 done if [ $ret != 0 ]; then echo "I:failed"; fi @@ -286,8 +279,7 @@ matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1 + $DIGCMD @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic dig.out.$j else @@ -313,8 +305,7 @@ matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 cyclic2.example > dig.out.cyclic2 || ret=1 + $DIGCMD @10.53.0.2 cyclic2.example > dig.out.cyclic2 || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic2 dig.out.$j else @@ -339,8 +330,7 @@ do done for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 do -$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.2 random.example > dig.out.random || ret=1 + $DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1 match=0 for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 do @@ -367,8 +357,7 @@ if $test_fixed; then ret=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 do - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.3 fixed.example > dig.out.fixed || ret=1 + $DIGCMD @10.53.0.3 fixed.example > dig.out.fixed || ret=1 cmp -s dig.out.fixed dig.out.fixed.good || ret=1 done if [ $ret != 0 ]; then echo "I:failed"; fi @@ -381,14 +370,12 @@ fi echo "I: Checking order cyclic (cache + additional)" ret=0 # prime acache -$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1 +$DIGCMD @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1 matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1 + $DIGCMD @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic dig.out.$j else @@ -411,14 +398,12 @@ status=`expr $status + $ret` echo "I: Checking order cyclic (cache)" ret=0 # prime acache -$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.3 cyclic2.example > dig.out.cyclic2 || ret=1 +$DIGCMD @10.53.0.3 cyclic2.example > dig.out.cyclic2 || ret=1 matches=0 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do j=`expr $i % 4` - $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.3 cyclic2.example > dig.out.cyclic2 || ret=1 + $DIGCMD @10.53.0.3 cyclic2.example > dig.out.cyclic2 || ret=1 if [ $i -le 4 ]; then cp dig.out.cyclic2 dig.out.$j else @@ -443,8 +428,7 @@ do done for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 do -$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ - -p 5300 @10.53.0.3 random.example > dig.out.random || ret=1 + $DIGCMD @10.53.0.3 random.example > dig.out.random || ret=1 match=0 for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 do