Also change expected_result for backends

diff --git a/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result b/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result
index 83ddc5d5523fbe9865d5c80ffd6a48d0e17fd21c..8cedfa2115876912297828c6c9534ec9865a3987 100644 (file)
--- a/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result
+++ b/modules/geoipbackend/regression-tests/basic-a-dnssec/expected_result
@@ -1,5 +1,5 @@
 0      www.geo.example.com.    IN      A       30      127.0.0.1
 0      www.geo.example.com.    IN      RRSIG   30      A 8 4 30 [expiry] [inception] [keytag] geo.example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result b/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
index 2f7a1041fcfdd56f64397c6c0721fb75cade673b..05838e43b4f26dde4e928ee3df804c5cd9307d04 100644 (file)
--- a/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/basic-a-resolution/expected_result
@@ -1,3 +1,3 @@
 0      www.geo.example.com.    IN      A       30      127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='www.geo.example.com.', qtype=A

diff --git a/modules/geoipbackend/regression-tests/static-any-resolution/expected_result b/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
index 4b35164cf456329598c477ce8c8c230508053f0e..967e069c12aa6a208e63cd213877b783e361ba2f 100644 (file)
--- a/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
+++ b/modules/geoipbackend/regression-tests/static-any-resolution/expected_result
@@ -2,5 +2,5 @@
 0      geo.example.com.        IN      NS      30      ns1.example.com.
 0      geo.example.com.        IN      NS      30      ns2.example.com.
 0      geo.example.com.        IN      SOA     30      ns1.example.com. hostmaster.example.com. 2014090125 7200 3600 1209600 3600
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='geo.example.com.', qtype=ANY

diff --git a/modules/remotebackend/regression-tests/apex-test/expected_result b/modules/remotebackend/regression-tests/apex-test/expected_result
index 11c99e71c2430fab43825409c8379a89e1d1b0ac..e8f5ca6aa9004934477f1ae870fc598addb2a25a 100644 (file)
--- a/modules/remotebackend/regression-tests/apex-test/expected_result
+++ b/modules/remotebackend/regression-tests/apex-test/expected_result
@@ -2,5 +2,5 @@
 0      up.example.com. IN      NS      120     ns2.example.com.
 2      ns1.example.com.        IN      A       120     192.168.2.2
 2      ns2.example.com.        IN      A       120     192.168.2.3
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='up.example.com.', qtype=NS

diff --git a/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result b/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result
index 76c3feccdd4d782e04f7e54362a845074e12dcc7..896afdf91bf1b26dc52d00dfee9ee82f33da39dd 100644 (file)
--- a/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result
+++ b/modules/remotebackend/regression-tests/basic-a-dnssec/expected_result
@@ -1,5 +1,5 @@
 0      outpost.example.com.    IN      A       120     192.168.2.1
 0      outpost.example.com.    IN      RRSIG   120     A 8 3 120 [expiry] [inception] [keytag] example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/basic-a-resolution/expected_result b/modules/remotebackend/regression-tests/basic-a-resolution/expected_result
index 146e6035f2acaff0a9476af4240b2ef7cc237eca..b7318a1274eaaaa25fb05c426eed9934aafeeadb 100644 (file)
--- a/modules/remotebackend/regression-tests/basic-a-resolution/expected_result
+++ b/modules/remotebackend/regression-tests/basic-a-resolution/expected_result
@@ -1,3 +1,3 @@
 0      outpost.example.com.    IN      A       120     192.168.2.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result b/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result
index 1155d21a5538e1371cc0cdad46bc8e726039a03c..fcac5c604325564d3da0218e522fbef599ab44e3 100644 (file)
--- a/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result
+++ b/modules/remotebackend/regression-tests/basic-aaaa-resolution/expected_result
@@ -1,3 +1,3 @@
 0      outpost.example.com.    IN      AAAA    120     fe80::1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outpost.example.com.', qtype=AAAA

diff --git a/modules/remotebackend/regression-tests/dnssec-keys/expected_result b/modules/remotebackend/regression-tests/dnssec-keys/expected_result
index 29a87de8a713d2a461ce5f06abd3003c6add5577..8842ca7ee09f5fba0b7e19c3dedbdb7403e55b69 100644 (file)
--- a/modules/remotebackend/regression-tests/dnssec-keys/expected_result
+++ b/modules/remotebackend/regression-tests/dnssec-keys/expected_result
@@ -1,4 +1,4 @@
 0      example.com.    IN      DNSKEY  120     256 3 8 ...
 0      example.com.    IN      DNSKEY  120     257 3 8 ...
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='example.com.', qtype=DNSKEY

diff --git a/modules/remotebackend/regression-tests/long-txt-resolution/expected_result b/modules/remotebackend/regression-tests/long-txt-resolution/expected_result
index 7ae60e605fb0873541d40e82a780e2a5d1a3ce12..76b71f08b5a511b5436d14fc54e705fbf5937826 100644 (file)
--- a/modules/remotebackend/regression-tests/long-txt-resolution/expected_result
+++ b/modules/remotebackend/regression-tests/long-txt-resolution/expected_result
@@ -1,3 +1,3 @@
 0      jump.up.example.com.    IN      TXT     120     "a very very long indeed text string that should pass out clean and proper thru the entire chain of powerdns processing"
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=TXT

diff --git a/modules/remotebackend/regression-tests/ns-at-delegation/expected_result b/modules/remotebackend/regression-tests/ns-at-delegation/expected_result
index 11c99e71c2430fab43825409c8379a89e1d1b0ac..e8f5ca6aa9004934477f1ae870fc598addb2a25a 100644 (file)
--- a/modules/remotebackend/regression-tests/ns-at-delegation/expected_result
+++ b/modules/remotebackend/regression-tests/ns-at-delegation/expected_result
@@ -2,5 +2,5 @@
 0      up.example.com. IN      NS      120     ns2.example.com.
 2      ns1.example.com.        IN      A       120     192.168.2.2
 2      ns2.example.com.        IN      A       120     192.168.2.3
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='up.example.com.', qtype=NS

diff --git a/modules/remotebackend/regression-tests/nsec-middle/expected_result b/modules/remotebackend/regression-tests/nsec-middle/expected_result
index 86441a9e534d01393693df52bb61baf5eba4b025..82d213bfb7261b257a35fec96f66e0c6f63b86e4 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-middle/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-middle/expected_result
@@ -5,5 +5,5 @@
 1      ns2.example.com.        IN      NSEC    120     outpost.example.com. A RRSIG NSEC
 1      ns2.example.com.        IN      RRSIG   120     NSEC 8 3 120 [expiry] [inception] [keytag] example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow b/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow
index 65a5f891b0d2454a5403bd19b998294231a2be61..5c286f5c6e87e5a031266df4f0f6c6aa0be7ab81 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow
+++ b/modules/remotebackend/regression-tests/nsec-middle/expected_result.narrow
@@ -3,5 +3,5 @@
 1      example.com.    IN      RRSIG   120     SOA 8 2 120 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3
index 65a5f891b0d2454a5403bd19b998294231a2be61..5c286f5c6e87e5a031266df4f0f6c6aa0be7ab81 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-middle/expected_result.nsec3
@@ -3,5 +3,5 @@
 1      example.com.    IN      RRSIG   120     SOA 8 2 120 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='outerpost.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result
index df702667b0692f33e05239c1d068c68225416b2e..19e415d569577bdaf8f059caf38b98bb2b4ad920 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result
@@ -1,5 +1,5 @@
 0      jump.up.example.com.    IN      A       120     192.168.3.1
 0      jump.up.example.com.    IN      RRSIG   120     A 8 4 120 [expiry] [inception] [keytag] up.example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow
index 018dacf8df455b9227d53b035fa2e44d8815d2c6..4be4e3db8d8a20c8e14593165b3c65309ea540fb 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow
+++ b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.narrow
@@ -2,5 +2,5 @@
 0      jump.up.example.com.    IN      RRSIG   120     A 8 4 120 [expiry] [inception] [keytag] up.example.com. ...
 0      jump.up.example.com.    IN      RRSIG   120     A 8 4 120 [expiry] [inception] [keytag] up.example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3
index 018dacf8df455b9227d53b035fa2e44d8815d2c6..4be4e3db8d8a20c8e14593165b3c65309ea540fb 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-sibling-test/expected_result.nsec3
@@ -2,5 +2,5 @@
 0      jump.up.example.com.    IN      RRSIG   120     A 8 4 120 [expiry] [inception] [keytag] up.example.com. ...
 0      jump.up.example.com.    IN      RRSIG   120     A 8 4 120 [expiry] [inception] [keytag] up.example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='jump.up.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result
index 89c9aa94146a6e7eb5280acd53acc6f22b50391f..9381e4eaf4b33d49acb2f6f0ea175cb10d2b9b5b 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result
@@ -3,5 +3,5 @@
 1      example.com.    IN      RRSIG   120     SOA 8 2 120 [expiry] [inception] [keytag] example.com. ...
 1      example.com.    IN      SOA     120     ns1.example.com. hostmaster.example.com. 2000010101 28800 7200 1209600 120
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3
index a20b5458d212e90c2a801bfbcfa392b64c93c5e8..58c27d02d59369f2ecc6f9bef6f5eab616990dd7 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-begin/expected_result.nsec3
@@ -7,5 +7,5 @@
 1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
 1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result
index f0dd6f40829ae890267150476f7669ffd74d30d7..ba05865d459331d486299d0afbc0d5daaf713f80 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result
@@ -5,5 +5,5 @@
 1      www.example.com.        IN      NSEC    120     example.com. A RRSIG NSEC
 1      www.example.com.        IN      RRSIG   120     NSEC 8 3 120 [expiry] [inception] [keytag] example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A

diff --git a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3 b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3
index a20b5458d212e90c2a801bfbcfa392b64c93c5e8..58c27d02d59369f2ecc6f9bef6f5eab616990dd7 100644 (file)
--- a/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3
+++ b/modules/remotebackend/regression-tests/nsec-wraparound-end/expected_result.nsec3
@@ -7,5 +7,5 @@
 1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      NSEC3   86400   1 1 1 abcd VTP9NUQBEH436S7J0K8TI2A32MMKCUUL NS SOA MX RRSIG DNSKEY NSEC3PARAM
 1      vtnq6ocn2vkuiv3nju14oqtaen2mt5sk.example.com.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] example.com. ...
 2      .       IN      OPT     32768   
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
+Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='zzz.example.com.', qtype=A