update rpzrecurse for RPZ_LOG_QTYPE_QCLASS

diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index 9612450ab47b20bd4d8f47272f3551839123d917..f934b6356e6ed65690d0dff83b5f4014683460e7 100644 (file)
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -189,6 +189,14 @@ main(int argc, char **argv) {
 #endif
        }
 
+       if (strcmp(argv[1], "--rpz-log-qtype-qclass") == 0) {
+#ifdef RPZ_LOG_QTYPE_QCLASS
+               return (0);
+#else
+               return (1);
+#endif
+       }
+
        fprintf(stderr, "unknown arg: %s\n", argv[1]);
        usage();
        return (1);

diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh
index 6a69356d5a0b50a8d273cce33060a470dd9fddea..b8615fb9e10b49dee7c073f4061697b3d924762e 100644 (file)
--- a/bin/tests/system/rpzrecurse/tests.sh
+++ b/bin/tests/system/rpzrecurse/tests.sh
@@ -303,15 +303,24 @@ cur=`awk 'BEGIN {l=0} /^/ {l++} END { print l }' ns2/named.run`
 $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.4 > dig.out.${t}
 $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.3 >> dig.out.${t}
 $DIG $DIGOPTS l2.l1.l0 a @10.53.0.2 -p ${PORT} -b 10.53.0.2 >> dig.out.${t}
-sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.4.0.53.10.rpz-client-ip.log1" > /dev/null && {
+if $FEATURETEST --rpz-log-qtype-qclass
+then
+  AIN="/A/IN"
+else
+  AIN=
+fi
+expected4="view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0${AIN} via 32.4.0.53.10.rpz-client-ip.log1"
+expected3="view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0${AIN} via 32.3.0.53.10.rpz-client-ip.log2"
+expected2="view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0${AIN} via 32.2.0.53.10.rpz-client-ip.log3"
+sed -n "$cur,"'$p' < ns2/named.run | grep "$expected4" > /dev/null && {
     echo_i " failed: unexpected rewrite message for policy zone log1 was logged"
     status=1
 }
-sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.3.0.53.10.rpz-client-ip.log2" > /dev/null || {
+sed -n "$cur,"'$p' < ns2/named.run | grep "$expected3" > /dev/null || {
     echo_i " failed: expected rewrite message for policy zone log2 was not logged"
     status=1
 }
-sed -n "$cur,"'$p' < ns2/named.run | grep "view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0 via 32.2.0.53.10.rpz-client-ip.log3" > /dev/null || {
+sed -n "$cur,"'$p' < ns2/named.run | grep "$expected2" > /dev/null || {
     echo_i " failed: expected rewrite message for policy zone log3 was not logged"
     status=1
 }