Remove NARROW results as they are now the same as normal expected_result

diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.narrow b/regression-tests/1dyndns-update-add-delete/expected_result.narrow
deleted file mode 100644 (file)
index 9c2bbdf..0000000
--- a/regression-tests/1dyndns-update-add-delete/expected_result.narrow
+++ /dev/null
@@ -1,22 +0,0 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='add-delete.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      add-delete.test.dyndns. IN      A       3600    127.0.0.108
-0      gkhs0ms64101fs1dj19h7no8vn2tp4fk.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd GKHS0MS64101FS1DJ19H7NO8VN2TP4FL A RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='add-delete.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='add-delete.test.dyndns.', qtype=ANY

diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result b/regression-tests/1dyndns-update-delegate-in-between/expected_result
index 0581edf8e6687843027629696e7b303ae572d4d7..9938c518707ade51faba9feef954d06c14a0b390 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result
@@ -1,94 +1,43 @@
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -100,92 +49,47 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   c.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
 1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      c.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 2      ns1.c.host.test.dyndns. IN      A       3600    127.0.0.2
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
 1      c.host.test.dyndns.     IN      NS      3600    ns1.c.host.test.dyndns.
-1      c.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 2      ns1.c.host.test.dyndns. IN      A       3600    127.0.0.2
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      c.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. NS RRSIG NSEC
-1      c.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -197,94 +101,45 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      ns1.c.host.test.dyndns. IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      ns1.c.host.test.dyndns. IN      RRSIG   86400   NSEC 8 5 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   ns1.c.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      ns1.c.host.test.dyndns. IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      ns1.c.host.test.dyndns. IN      RRSIG   86400   NSEC 8 5 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -296,96 +151,45 @@ Answer:
 ;test.dyndns.                  IN      SOA
 
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0

diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow b/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow
index b49ef51512ff287a3d5ad9abb5ace1d29d3cbbae..b16aef96cc36046c133c150ccdd1446c06a02be4 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result.narrow
@@ -1,7 +1,5 @@
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -38,8 +36,6 @@ Reply to question for qname='c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -119,8 +115,6 @@ Answer:
 
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -142,7 +136,6 @@ Reply to question for qname='b.host.test.dyndns.', qtype=ANY
 1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 2      ns1.c.host.test.dyndns. IN      A       3600    127.0.0.2
-2      ns1.c.host.test.dyndns. IN      RRSIG   3600    A 8 5 3600 [expiry] [inception] [keytag] test.dyndns. ...
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
 1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
@@ -156,8 +149,6 @@ Reply to question for qname='c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -203,7 +194,6 @@ Reply to question for qname='b.b.host.test.dyndns.', qtype=ANY
 1      lmrsadk2bb62qpruaules5i5ap06cp55.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 2      ns1.c.host.test.dyndns. IN      A       3600    127.0.0.2
-2      ns1.c.host.test.dyndns. IN      RRSIG   3600    A 8 5 3600 [expiry] [inception] [keytag] test.dyndns. ...
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
 Reply to question for qname='c.c.host.test.dyndns.', qtype=ANY
 1      4lu40mioapf67tru8es6u204hifn8p3l.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N
@@ -236,8 +226,6 @@ Answer:
 
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -270,8 +258,6 @@ Reply to question for qname='c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -351,8 +337,6 @@ Answer:
 
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -389,8 +373,6 @@ Reply to question for qname='c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   

diff --git a/regression-tests/1dyndns-update-delegate/expected_result.narrow b/regression-tests/1dyndns-update-delegate/expected_result.narrow
deleted file mode 100755 (executable)
index 6ab5e63..0000000
--- a/regression-tests/1dyndns-update-delegate/expected_result.narrow
+++ /dev/null
@@ -1,73 +0,0 @@
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-1      delegate1.test.dyndns.  IN      NS      3600    ns1.delegate1.test.dyndns.
-1      delegate1.test.dyndns.  IN      NS      3600    ns2.delegate1.test.dyndns.
-2      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-1      delegate2.test.dyndns.  IN      NS      3600    ns1.delegate2.test.dyndns.
-1      delegate2.test.dyndns.  IN      NS      3600    ns2.example.com.
-2      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-2      ns2.example.com.        IN      A       120     192.168.1.2
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delegate1.test.dyndns.', qtype=ANY
-0      ns1.delegate1.test.dyndns.      IN      A       3600    127.0.0.1
-0      rcogol03mg1pg3u4338eo0nvvh6bs567.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd RCOGOL03MG1PG3U4338EO0NVVH6BS568 A RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-0      ns2.delegate1.test.dyndns.      IN      A       3600    127.0.0.2
-0      oshpf39sqa4j1ciudbbvtb5dkrijnpss.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd OSHPF39SQA4J1CIUDBBVTB5DKRIJNPST A RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-0      asm440u7p2im2slo6iqo92vfp6jtopa0.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd ASM440U7P2IM2SLO6IQO92VFP6JTOPA1 A RRSIG
-0      ns1.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-0      ns2.delegate2.test.dyndns.      IN      A       3600    127.0.0.1
-0      rcd0fo052s6a41ao8ue0b43e1mhv50ds.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd RCD0FO052S6A41AO8UE0B43E1MHV50DT A RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate1.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='ns2.delegate2.test.dyndns.', qtype=ANY

diff --git a/regression-tests/1dyndns-update-delete-add-host/expected_result.narrow b/regression-tests/1dyndns-update-delete-add-host/expected_result.narrow
deleted file mode 100644 (file)
index 13355b5..0000000
--- a/regression-tests/1dyndns-update-delete-add-host/expected_result.narrow
+++ /dev/null
@@ -1,26 +0,0 @@
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
-0      slsck1enia56lrkr5gep7clu9j1o5ifn.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd SLSCK1ENIA56LRKR5GEP7CLU9J1O5IFO A TXT RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
-0      slsck1enia56lrkr5gep7clu9j1o5ifn.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd SLSCK1ENIA56LRKR5GEP7CLU9J1O5IFO TXT RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
-0      slsck1enia56lrkr5gep7clu9j1o5ifn.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd SLSCK1ENIA56LRKR5GEP7CLU9J1O5IFO A TXT RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delete-add.test.dyndns.', qtype=ANY

diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/expected_result.narrow b/regression-tests/1dyndns-update-delete-multi-add-host/expected_result.narrow
deleted file mode 100644 (file)
index 5529581..0000000
--- a/regression-tests/1dyndns-update-delete-multi-add-host/expected_result.narrow
+++ /dev/null
@@ -1,25 +0,0 @@
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
-0      slsck1enia56lrkr5gep7clu9j1o5ifn.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd SLSCK1ENIA56LRKR5GEP7CLU9J1O5IFO A TXT RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
-Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delete-add.test.dyndns.', qtype=ANY
-Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
-;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
-;; ZONE SECTION:
-;test.dyndns.                  IN      SOA
-
-0      delete-add.test.dyndns. IN      A       3600    127.0.0.108
-0      delete-add.test.dyndns. IN      TXT     3600    "Should be gone after a while"
-0      slsck1enia56lrkr5gep7clu9j1o5ifn.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd SLSCK1ENIA56LRKR5GEP7CLU9J1O5IFO A TXT RRSIG
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='delete-add.test.dyndns.', qtype=ANY

diff --git a/regression-tests/1dyndns-update-in-between/expected_result b/regression-tests/1dyndns-update-in-between/expected_result
index 7a444814dbd7c03809fdf4d20f6ec69eb6d8a4a0..91dc864fe9eee2333559c2515083d129cbbf5734 100755 (executable)
--- a/regression-tests/1dyndns-update-in-between/expected_result
+++ b/regression-tests/1dyndns-update-in-between/expected_result
@@ -1,65 +1,31 @@
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -70,66 +36,34 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   d.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   d.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   d.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   d.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
 0      d.host.test.dyndns.     IN      A       3600    127.0.0.1
-0      d.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-0      d.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      d.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
@@ -140,68 +74,34 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
-1      delete-add.test.dyndns. IN      NSEC    86400   a.host.test.dyndns. A TXT RRSIG NSEC
-1      delete-add.test.dyndns. IN      RRSIG   86400   NSEC 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.a.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-1      a.host.test.dyndns.     IN      NSEC    86400   e.host.test.dyndns. A RRSIG NSEC
-1      a.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
-0      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.host.test.dyndns.', qtype=ANY
-1      e.host.test.dyndns.     IN      NSEC    86400   host-1.test.dyndns. A RRSIG NSEC
-1      e.host.test.dyndns.     IN      RRSIG   86400   NSEC 8 4 86400 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      NSEC    86400   cname1.test.dyndns. NS SOA MX RRSIG NSEC DNSKEY
-1      test.dyndns.    IN      RRSIG   3600    SOA 8 2 3600 [expiry] [inception] [keytag] test.dyndns. ...
-1      test.dyndns.    IN      RRSIG   86400   NSEC 8 2 86400 [expiry] [inception] [keytag] test.dyndns. ...
 1      test.dyndns.    IN      SOA     3600    ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0

diff --git a/regression-tests/1dyndns-update-in-between/expected_result.narrow b/regression-tests/1dyndns-update-in-between/expected_result.narrow
index b51d8b3bb596c1c38369f126841e3fa20b748a83..53f46b11d7c14891438b5af55a81bf4e67773ccd 100755 (executable)
--- a/regression-tests/1dyndns-update-in-between/expected_result.narrow
+++ b/regression-tests/1dyndns-update-in-between/expected_result.narrow
@@ -7,8 +7,6 @@ Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -56,8 +54,6 @@ Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -89,8 +85,6 @@ Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -127,15 +121,11 @@ Reply to question for qname='c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
-0      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 4LU40MIOAPF67TRU8ES6U204HIFN8P3N A RRSIG
-0      4lu40mioapf67tru8es6u204hifn8p3m.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      d.host.test.dyndns.     IN      A       3600    127.0.0.1
 0      d.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
@@ -167,8 +157,6 @@ Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host.test.dyndns.', qtype=ANY
 0      a.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      a.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd DSA3TI9NU3APDSVL3F63QLVAKV555SR7 A RRSIG
-0      dsa3ti9nu3apdsvl3f63qlvakv555sr6.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768   
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='a.host.test.dyndns.', qtype=ANY
@@ -216,8 +204,6 @@ Reply to question for qname='a.c.host.test.dyndns.', qtype=ANY
 2      .       IN      OPT     32768   
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='d.host.test.dyndns.', qtype=ANY
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      NSEC3   86400   1 1 1 abcd 8TI9TGH8D81FRR5VR4O1O5BVKO42V9DR A RRSIG
-0      8ti9tgh8d81frr5vr4o1o5bvko42v9dq.test.dyndns.   IN      RRSIG   86400   NSEC3 8 3 86400 [expiry] [inception] [keytag] test.dyndns. ...
 0      e.host.test.dyndns.     IN      A       3600    1.1.1.1
 0      e.host.test.dyndns.     IN      RRSIG   3600    A 8 4 3600 [expiry] [inception] [keytag] test.dyndns. ...
 2      .       IN      OPT     32768