use cleannsupdate

diff --git a/regression-tests/0dyndns-prereq-all/command b/regression-tests/0dyndns-prereq-all/command
index 409228b8a4882de7c43e00faa054fa3d0a2b427e..b90cab9aca3a46eb5a33f0fec7140a5c6a26fe60 100755 (executable)
--- a/regression-tests/0dyndns-prereq-all/command
+++ b/regression-tests/0dyndns-prereq-all/command
@@ -5,7 +5,7 @@ cleandig host-255.test.dyndns ANY hidesoadetails
 
 # check if a domain exists, this should result in an NXDomain (section 3.2.1)
 # if the check fails, it will delete a record, which should not happen.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxdomain host-255.test.dyndns
@@ -19,7 +19,7 @@ cleandig host-1.test.dyndns ANY
 
 # check if the record exists, should result in an NXRRSET (section 3.2.1)
 # if the check fails, it will delete a record. 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset host-255.test.dyndns A
@@ -34,7 +34,7 @@ cleandig host-2.test.dyndns A
 
 # check if host-2 does not exist, if so, delete host-2.
 # this checks section 3.2.2
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq nxdomain host-2.test.dyndns
@@ -47,7 +47,7 @@ answer
 cleandig host-2.test.dyndns A
 
 # check if the specific record type styll exists, if not the case, delete it.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq nxrrset host-2.test.dyndns A
@@ -60,7 +60,7 @@ answer
 cleandig host-2.test.dyndns A
 
 # Check ENT records
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxdomain host.test.dyndns 

diff --git a/regression-tests/0dyndns-prereq-all/expected_result b/regression-tests/0dyndns-prereq-all/expected_result
index f570a26f632066d15a7dd8bf24e18ca0edbaaab6..512bc4ce5b26f6a81259679412cf33076b10c0b8 100644 (file)
--- a/regression-tests/0dyndns-prereq-all/expected_result
+++ b/regression-tests/0dyndns-prereq-all/expected_result
@@ -2,7 +2,7 @@
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-255.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXDOMAIN ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NXDOMAIN, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-1.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -23,7 +23,7 @@ Reply to question for qname='host-1.test.dyndns.', qtype=A
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-2.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: YXDOMAIN ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: YXDOMAIN, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -32,7 +32,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-2.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: YXRRSET ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: YXRRSET, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -41,7 +41,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='host-2.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXDOMAIN ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NXDOMAIN, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/command b/regression-tests/0dyndns-prereq-nxrrset-full/command
index b032800f20bf8037fc7d2283381a6301a0f55f48..e8291930becc464001d5e113c6603f578bd4a7e4 100755 (executable)
--- a/regression-tests/0dyndns-prereq-nxrrset-full/command
+++ b/regression-tests/0dyndns-prereq-nxrrset-full/command
@@ -3,7 +3,7 @@
 # query to see if the records that we need, are actually there.
 cleandig multi.test.dyndns ANY
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset multi.test.dyndns IN A 127.0.0.1
@@ -12,7 +12,7 @@ send
 answer
 !
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset multi.test.dyndns IN A 127.0.0.1
@@ -22,7 +22,7 @@ send
 answer
 !
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset multi.test.dyndns IN A 127.0.0.1

diff --git a/regression-tests/0dyndns-prereq-nxrrset-full/expected_result b/regression-tests/0dyndns-prereq-nxrrset-full/expected_result
index 729afea638df4daa53c539904bb050a954e2e7a3..e068c933bc263cb526120d1f5dfc0ab262d4b6a4 100644 (file)
--- a/regression-tests/0dyndns-prereq-nxrrset-full/expected_result
+++ b/regression-tests/0dyndns-prereq-nxrrset-full/expected_result
@@ -4,19 +4,19 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='multi.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NXRRSET, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-big-package/command b/regression-tests/1dyndns-big-package/command
index 3c33e97a489ab5fb9c2fc1a8c4c981d79f3497ed..5aaf00bcbd459f46a327388f987847c5b92314ed 100755 (executable)
--- a/regression-tests/1dyndns-big-package/command
+++ b/regression-tests/1dyndns-big-package/command
@@ -4,7 +4,7 @@
 cleandig big-txt.test.dyndns TXT
 
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add big-txt.test.dyndns. 600 TXT "99 bottles of beer on the wall, 99 bottles of beer. Take one down, pass it around, 98 bottles of beer on the wall."
@@ -34,7 +34,7 @@ answer
 # check if things are added
 cleandig big-txt.test.dyndns TXT
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete big-txt.test.dyndns. TXT

diff --git a/regression-tests/1dyndns-update-add-delete-cname/command b/regression-tests/1dyndns-update-add-delete-cname/command
index bd7d12eb3883cd2bbeb4fdf73d9a49ae6b005f21..396672cff500d2a64932555350d345fc5fe67701 100755 (executable)
--- a/regression-tests/1dyndns-update-add-delete-cname/command
+++ b/regression-tests/1dyndns-update-add-delete-cname/command
@@ -4,7 +4,7 @@
 cleandig cname3.test.dyndns CNAME hidesoadetails 
 
 # add mx record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add cname3.test.dyndns. 3600 CNAME cname1.test.dyndns.
@@ -16,7 +16,7 @@ answer
 cleandig cname3.test.dyndns CNAME
 
 # delete the just added record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete cname3.test.dyndns. 3600 CNAME cname1.test.dyndns.

diff --git a/regression-tests/1dyndns-update-add-delete-cname/expected_result b/regression-tests/1dyndns-update-add-delete-cname/expected_result
index a096d66c4f2216581321085bb3ac9e4cbe82a881..e50de512febffbf1fdfb0c7c410867144c0261d2 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete-cname/expected_result
+++ b/regression-tests/1dyndns-update-add-delete-cname/expected_result
@@ -2,7 +2,7 @@
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname3.test.dyndns.', qtype=CNAME
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname3.test.dyndns.', qtype=CNAME
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-add-delete-mx/command b/regression-tests/1dyndns-update-add-delete-mx/command
index ff6acb21270e37e15230aafb5e3afe2e7eed0def..5c212a595ca3e1c1987661cceb35827fe3e48967 100755 (executable)
--- a/regression-tests/1dyndns-update-add-delete-mx/command
+++ b/regression-tests/1dyndns-update-add-delete-mx/command
@@ -4,7 +4,7 @@
 cleandig test.dyndns MX
 
 # add mx record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3000 MX 30 host-3.test.dyndns
@@ -16,7 +16,7 @@ answer
 cleandig test.dyndns MX
 
 # delete the just added record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns. 3000 MX 30 host-3.test.dyndns

diff --git a/regression-tests/1dyndns-update-add-delete-mx/expected_result b/regression-tests/1dyndns-update-add-delete-mx/expected_result
index ddba2262f4f9b184e811d2a4c98872c7e95454a5..9dc25bab4f6f8a6beb9697989b996432f5643825 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete-mx/expected_result
+++ b/regression-tests/1dyndns-update-add-delete-mx/expected_result
@@ -5,7 +5,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -19,7 +19,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/command b/regression-tests/1dyndns-update-add-delete-wildcard/command
index 1ef72008f03d22856a64a2c553c0aed81323ba69..0e2058703f74adc2267740c0f2163392474cf289 100755 (executable)
--- a/regression-tests/1dyndns-update-add-delete-wildcard/command
+++ b/regression-tests/1dyndns-update-add-delete-wildcard/command
@@ -4,7 +4,7 @@
 cleandig abc.add-delete.test.dyndns ANY hidesoadetails 
 
 # add a record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq nxrrset *.add-delete.test.dyndns TXT
@@ -18,7 +18,7 @@ cleandig abc.add-delete.test.dyndns ANY
 cleandig abc1.add-delete.test.dyndns ANY
 
 # delete the just added record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset *.add-delete.test.dyndns TXT

diff --git a/regression-tests/1dyndns-update-add-delete-wildcard/expected_result b/regression-tests/1dyndns-update-add-delete-wildcard/expected_result
index 50ab00949a8cec4b72493b4404f19ceba6ad862a..5cc2de35e640ff005e6349e60f2f53ca5b68c917 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete-wildcard/expected_result
+++ b/regression-tests/1dyndns-update-add-delete-wildcard/expected_result
@@ -2,7 +2,7 @@
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='abc.add-delete.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -14,7 +14,7 @@ Reply to question for qname='abc.add-delete.test.dyndns.', qtype=ANY
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='abc1.add-delete.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-add-delete/command b/regression-tests/1dyndns-update-add-delete/command
index aadd4fe7a6e9ed6cb4d64462c3e7c949bdee4656..905ecc44ec1aa2a36abbdbe868fb8ec206ce0a9e 100755 (executable)
--- a/regression-tests/1dyndns-update-add-delete/command
+++ b/regression-tests/1dyndns-update-add-delete/command
@@ -4,7 +4,7 @@
 cleandig add-delete.test.dyndns ANY hidesoadetails
 
 # add a record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq nxrrset add-delete.test.dyndns A
@@ -17,7 +17,7 @@ answer
 cleandig add-delete.test.dyndns ANY
 
 # delete the just added record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset add-delete.test.dyndns A

diff --git a/regression-tests/1dyndns-update-add-delete/expected_result b/regression-tests/1dyndns-update-add-delete/expected_result
index 25d8bb1b9a6d302b079f9db88ab1f09278c03ed8..2167a1a5ab31492f94b1e5fb17256ca221fe905b 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete/expected_result
+++ b/regression-tests/1dyndns-update-add-delete/expected_result
@@ -2,7 +2,7 @@
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-add-soa/command b/regression-tests/1dyndns-update-add-soa/command
index 703e2218649f5f175f0abea7eee4de3308ca9597..15dc63b0163caf3872c11d0ae5a13faf50f5183b 100755 (executable)
--- a/regression-tests/1dyndns-update-add-soa/command
+++ b/regression-tests/1dyndns-update-add-soa/command
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test2.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050100999 28800 7200 604800 86400
@@ -8,7 +8,7 @@ send
 answer
 !
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test2.dyndns
 update add test2.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050100999 28800 7200 604800 86400
@@ -16,7 +16,7 @@ send
 answer
 !
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test2.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050100999 28800 7200 604800 86400

diff --git a/regression-tests/1dyndns-update-add-soa/expected_result b/regression-tests/1dyndns-update-add-soa/expected_result
index dd87fbf67ee9dad462dce87d7b9d1c981bed8996..d296fbbd5f64d25a40b2485473b8c6056ddca7b4 100644 (file)
--- a/regression-tests/1dyndns-update-add-soa/expected_result
+++ b/regression-tests/1dyndns-update-add-soa/expected_result
@@ -1,17 +1,17 @@
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOTZONE ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOTZONE, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
 
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOTAUTH ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOTAUTH, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test2.dyndns.                 IN      SOA
 
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOTZONE ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOTZONE, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delegate-in-between/command b/regression-tests/1dyndns-update-delegate-in-between/command
index 1ddc3000f89d343c47b5ea55df61ad26e5286b78..b3a6f44cc5d6d57cc3d5d806c050cf966a55dc3a 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate-in-between/command
+++ b/regression-tests/1dyndns-update-delegate-in-between/command
@@ -11,7 +11,7 @@ cleandig c.c.host.test.dyndns ANY dnssec hidesoadetails
 cleandig d.d.host.test.dyndns ANY dnssec hidesoadetails
 cleandig e.e.host.test.dyndns ANY dnssec hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add c.host.test.dyndns 3600 NS ns1.c.host.test.dyndns
@@ -32,7 +32,7 @@ cleandig c.c.host.test.dyndns ANY dnssec hidesoadetails
 cleandig d.d.host.test.dyndns ANY dnssec hidesoadetails
 cleandig e.e.host.test.dyndns ANY dnssec hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete c.host.test.dyndns NS
@@ -52,7 +52,7 @@ cleandig c.c.host.test.dyndns ANY dnssec hidesoadetails
 cleandig d.d.host.test.dyndns ANY dnssec hidesoadetails
 cleandig e.e.host.test.dyndns ANY dnssec hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete ns1.c.host.test.dyndns A

diff --git a/regression-tests/1dyndns-update-delegate-in-between/expected_result b/regression-tests/1dyndns-update-delegate-in-between/expected_result
index 9b038bd8b54f80d20065f88699d3526c1a060ff5..d08142eab136c7593947a69bcc51e69f7921047b 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate-in-between/expected_result
+++ b/regression-tests/1dyndns-update-delegate-in-between/expected_result
@@ -43,7 +43,7 @@ Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -95,7 +95,7 @@ Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -145,7 +145,7 @@ Reply to question for qname='d.d.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='e.e.host.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delegate/command b/regression-tests/1dyndns-update-delegate/command
index deab4ffeb319cea1a16960706208a113c0bb05cd..2dcf8de4838349d8b5a4d6fa92a7983355e9dd57 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate/command
+++ b/regression-tests/1dyndns-update-delegate/command
@@ -2,7 +2,7 @@
 
 cleandig delegate1.test.dyndns ANY hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add delegate1.test.dyndns 3600 NS ns1.delegate1.test.dyndns
@@ -15,7 +15,7 @@ answer
 
 cleandig delegate1.test.dyndns ANY
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add ns1.delegate2.test.dyndns 3600 A 192.168.0.3
@@ -28,7 +28,7 @@ answer
 
 cleandig delegate2.test.dyndns ANY
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete delegate2.test.dyndns NS
@@ -44,7 +44,7 @@ cleandig ns2.delegate1.test.dyndns ANY
 cleandig ns1.delegate2.test.dyndns ANY
 cleandig ns2.delegate2.test.dyndns ANY
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete ns1.delegate2.test.dyndns A

diff --git a/regression-tests/1dyndns-update-delegate/expected_result b/regression-tests/1dyndns-update-delegate/expected_result
index 5fe2795fcc3e9a1c94bb3b69203539a1b9aa789c..649d99aacd262794d7982b7a08838bdaf720ad25 100755 (executable)
--- a/regression-tests/1dyndns-update-delegate/expected_result
+++ b/regression-tests/1dyndns-update-delegate/expected_result
@@ -2,7 +2,7 @@
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -14,7 +14,7 @@ Answer:
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -26,7 +26,7 @@ Answer:
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -50,7 +50,7 @@ Reply to question for qname='ns1.delegate2.test.dyndns.', qtype=ANY
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delete-add-host/command b/regression-tests/1dyndns-update-delete-add-host/command
index 5f24e2bafd860545bb7a799df517ae25e87db0ed..bf74012a4a14c539870e7360b7abfbecee160ef1 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-add-host/command
+++ b/regression-tests/1dyndns-update-delete-add-host/command
@@ -4,7 +4,7 @@
 cleandig delete-add.test.dyndns ANY
 
 # add the record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete delete-add.test.dyndns. 3600 A 127.0.0.108
@@ -16,7 +16,7 @@ answer
 cleandig delete-add.test.dyndns ANY
 
 # add the record again
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add delete-add.test.dyndns. 3600 A 127.0.0.108

diff --git a/regression-tests/1dyndns-update-delete-add-host/expected_result b/regression-tests/1dyndns-update-delete-add-host/expected_result
index 557ddc6975a91b01b2254fdde8c2dc136c714769..4921bb81294018b4560391eeb2234d94b1745374 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-add-host/expected_result
+++ b/regression-tests/1dyndns-update-delete-add-host/expected_result
@@ -3,7 +3,7 @@
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -12,7 +12,7 @@ Answer:
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/command b/regression-tests/1dyndns-update-delete-multi-add-host/command
index 0063a52559d5866adb86dfedfd47f81f96ecfb5d..b81135ee52dc9f96145a2d968343c72fdab06351 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-multi-add-host/command
+++ b/regression-tests/1dyndns-update-delete-multi-add-host/command
@@ -5,7 +5,7 @@ cleandig delete-add.test.dyndns ANY
 
 # delete all delete-add.test.dyndns records
 # add-records that we deleted.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete delete-add.test.dyndns.
@@ -17,7 +17,7 @@ answer
 cleandig delete-add.test.dyndns ANY hidesoadetails
 
 # add-records that we deleted.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add delete-add.test.dyndns. 3600 A 127.0.0.108

diff --git a/regression-tests/1dyndns-update-delete-multi-add-host/expected_result b/regression-tests/1dyndns-update-delete-multi-add-host/expected_result
index ce7dc86f57de4f3b29fe1c9743ad90d232c37910..de3934a9337d9e5ec4d287965c1f862294394878 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-multi-add-host/expected_result
+++ b/regression-tests/1dyndns-update-delete-multi-add-host/expected_result
@@ -3,7 +3,7 @@
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -12,7 +12,7 @@ Answer:
 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
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delete-mx-prio/command b/regression-tests/1dyndns-update-delete-mx-prio/command
index d2d051f3cbd82c72d991b9c3a25a2cc63560c55f..7b20f0d6fce8ef7298dd3eb0d98e2bdfd4c34bc8 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-mx-prio/command
+++ b/regression-tests/1dyndns-update-delete-mx-prio/command
@@ -2,7 +2,7 @@
 cleandig test.dyndns MX hidesoadetails
 
 # Insert a MX record for the test.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns 3600 MX 100 mx1.google.com.
@@ -14,7 +14,7 @@ answer
 cleandig test.dyndns MX 
 
 # remove a MX record, with the wrong priority, so this should not match.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns 3600 MX 50 mx1.google.com.
@@ -26,7 +26,7 @@ answer
 cleandig test.dyndns MX
 
 # Finally delete it for real.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns 3600 MX 100 mx1.google.com.

diff --git a/regression-tests/1dyndns-update-delete-mx-prio/expected_result b/regression-tests/1dyndns-update-delete-mx-prio/expected_result
index 3ce1c683f0d90e73c8b7a267cdcd9f3a355bccd1..41153246a650e8c98421f9605cf174f9c455fda3 100644 (file)
--- a/regression-tests/1dyndns-update-delete-mx-prio/expected_result
+++ b/regression-tests/1dyndns-update-delete-mx-prio/expected_result
@@ -5,7 +5,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -18,7 +18,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -31,7 +31,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delete-ns/command b/regression-tests/1dyndns-update-delete-ns/command
index f694ce697073068a70cd77b2fbec69555e139f39..32b6bc31e97f15585d80600d55f26ddb85625c42 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-ns/command
+++ b/regression-tests/1dyndns-update-delete-ns/command
@@ -2,7 +2,7 @@
 
 cleandig test.dyndns NS
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns. NS
@@ -12,7 +12,7 @@ answer
 
 cleandig test.dyndns NS
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns. 3600 NS ns1.test.dyndns. 
@@ -23,7 +23,7 @@ answer
 
 cleandig test.dyndns NS
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns. 3600 NS ns1.test.dyndns.
@@ -33,7 +33,7 @@ answer
 
 cleandig test.dyndns NS
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3600 NS ns1.test.dyndns. 

diff --git a/regression-tests/1dyndns-update-delete-ns/expected_result b/regression-tests/1dyndns-update-delete-ns/expected_result
index 484018277fc82580e671e000aeada8aec1367610..caa023dd933573bdc4469c9334e6a0d872d49b1b 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-ns/expected_result
+++ b/regression-tests/1dyndns-update-delete-ns/expected_result
@@ -5,7 +5,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -17,7 +17,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -29,7 +29,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -39,7 +39,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=NS
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-delete-soa/command b/regression-tests/1dyndns-update-delete-soa/command
index 090ab903b78a4e63ffa344adfa8ebcab83df2d31..c097d2609f2ff1ba0c07431eead74cdb2dab7146 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-soa/command
+++ b/regression-tests/1dyndns-update-delete-soa/command
@@ -2,7 +2,7 @@
 
 cleandig test.dyndns SOA hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete test.dyndns. SOA

diff --git a/regression-tests/1dyndns-update-delete-soa/expected_result b/regression-tests/1dyndns-update-delete-soa/expected_result
index 9d979b0f56b22205a76beda2389a1db9939d62f9..122320733da5fc326e5b1f2ab7db122da4df4e6c 100755 (executable)
--- a/regression-tests/1dyndns-update-delete-soa/expected_result
+++ b/regression-tests/1dyndns-update-delete-soa/expected_result
@@ -2,7 +2,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-in-between/command b/regression-tests/1dyndns-update-in-between/command
index 3265ea5c3141bfcb7d4f972e943adc0d2f834741..34a0573d3629c2abf07908d4c96a2b464f82c60a 100755 (executable)
--- a/regression-tests/1dyndns-update-in-between/command
+++ b/regression-tests/1dyndns-update-in-between/command
@@ -9,7 +9,7 @@ cleandig d.host.test.dyndns ANY dnssec hidesoadetails
 cleandig e.host.test.dyndns ANY dnssec hidesoadetails
 cleandig f.host.test.dyndns ANY dnssec hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add d.host.test.dyndns. 3600 A 127.0.0.1
@@ -26,7 +26,7 @@ cleandig d.host.test.dyndns ANY dnssec hidesoadetails
 cleandig e.host.test.dyndns ANY dnssec hidesoadetails
 cleandig f.host.test.dyndns ANY dnssec hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete d.host.test.dyndns. 3600 A 127.0.0.1

diff --git a/regression-tests/1dyndns-update-in-between/expected_result b/regression-tests/1dyndns-update-in-between/expected_result
index 91dc864fe9eee2333559c2515083d129cbbf5734..f475980286edb6c3b61ef631ffb4917644c3440c 100755 (executable)
--- a/regression-tests/1dyndns-update-in-between/expected_result
+++ b/regression-tests/1dyndns-update-in-between/expected_result
@@ -31,7 +31,7 @@ Reply to question for qname='e.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -69,7 +69,7 @@ Reply to question for qname='e.host.test.dyndns.', qtype=ANY
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='f.host.test.dyndns.', qtype=ANY
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-replace-a-host/command b/regression-tests/1dyndns-update-replace-a-host/command
index 857cf7cb7b7e50d1b695a7df75c76500e16c1cef..76d65aeb2e29788dc020eeaba401ae2b21c40368 100755 (executable)
--- a/regression-tests/1dyndns-update-replace-a-host/command
+++ b/regression-tests/1dyndns-update-replace-a-host/command
@@ -4,7 +4,7 @@
 cleandig replace.test.dyndns A
 
 # replace the value
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete replace.test.dyndns. A
@@ -16,7 +16,7 @@ answer
 cleandig replace.test.dyndns A
 
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 prereq yxrrset replace.test.dyndns. A

diff --git a/regression-tests/1dyndns-update-replace-a-host/expected_result b/regression-tests/1dyndns-update-replace-a-host/expected_result
index e8ae0f0d1d7a7237e7df2b2f751500773ba5ff82..9f8a14b786e26ea2e3415b3b2f37fd0a1761806f 100644 (file)
--- a/regression-tests/1dyndns-update-replace-a-host/expected_result
+++ b/regression-tests/1dyndns-update-replace-a-host/expected_result
@@ -2,7 +2,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='replace.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='replace.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-replace-cname/command b/regression-tests/1dyndns-update-replace-cname/command
index 48e90d257be18c3106f056d2c3a8104f453d1fa0..17bd7c818f7a68dea7e0edeb3074875098303768 100755 (executable)
--- a/regression-tests/1dyndns-update-replace-cname/command
+++ b/regression-tests/1dyndns-update-replace-cname/command
@@ -1,7 +1,7 @@
 #!/bin/sh
 cleandig cname1.test.dyndns CNAME
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add cname1.test.dyndns. 3600 CNAME host-2.test.dyndns.
@@ -11,7 +11,7 @@ answer
 
 cleandig cname1.test.dyndns CNAME
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add cname1.test.dyndns. 3600 CNAME host-1.test.dyndns.

diff --git a/regression-tests/1dyndns-update-replace-cname/expected_result b/regression-tests/1dyndns-update-replace-cname/expected_result
index 5a32bd2c15cd44e477e5890d5dc965f1be75bcb0..a58ec44d0b9945e67c88170f2dd94d39cf8ef159 100755 (executable)
--- a/regression-tests/1dyndns-update-replace-cname/expected_result
+++ b/regression-tests/1dyndns-update-replace-cname/expected_result
@@ -2,7 +2,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname1.test.dyndns.', qtype=CNAME
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname1.test.dyndns.', qtype=CNAME
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-replace-mx/command b/regression-tests/1dyndns-update-replace-mx/command
index dba48213e8126d98b89d6d4b4ffd384b154e9fb3..52bbeddd2097afb4656a525a98f4731e75e6df73 100755 (executable)
--- a/regression-tests/1dyndns-update-replace-mx/command
+++ b/regression-tests/1dyndns-update-replace-mx/command
@@ -1,7 +1,7 @@
 #!/bin/sh
 cleandig test.dyndns MX 
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3000 MX 10 host-1.test.dyndns.
@@ -11,7 +11,7 @@ answer
 
 cleandig test.dyndns MX
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3600 MX 10 host-1.test.dyndns.

diff --git a/regression-tests/1dyndns-update-replace-mx/expected_result b/regression-tests/1dyndns-update-replace-mx/expected_result
index 2e5238081a44f13f5ca549d27cd29587fef5219c..09d66898f78e3c6004c6752d9f5419616f88cd67 100644 (file)
--- a/regression-tests/1dyndns-update-replace-mx/expected_result
+++ b/regression-tests/1dyndns-update-replace-mx/expected_result
@@ -5,7 +5,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -17,7 +17,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=MX
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-srv/command b/regression-tests/1dyndns-update-srv/command
index 0a4d16c7a082cfc6acabc4dd2d9cad75bbe6405a..78f2ba0c5fe8aab266497c7358fd8ca3785169ee 100755 (executable)
--- a/regression-tests/1dyndns-update-srv/command
+++ b/regression-tests/1dyndns-update-srv/command
@@ -2,7 +2,7 @@
 cleandig srv.test.dyndns SRV hidesoadetails
 
 # Insert a SRV record
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add srv.test.dyndns 3600 SRV 0 100 389 server1
@@ -12,7 +12,7 @@ answer
 cleandig srv.test.dyndns SRV
 
 # Insert anthoer with different prio, and update the other.
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add srv.test.dyndns 3600 SRV 1 100 389 server2
@@ -23,7 +23,7 @@ answer
 cleandig srv.test.dyndns SRV
 
 # And cleanup
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update delete srv.test.dyndns SRV

diff --git a/regression-tests/1dyndns-update-srv/expected_result b/regression-tests/1dyndns-update-srv/expected_result
index 8506f8314172ce2482d8996a033c1c313ace5b06..08f71ead7b587f68e01e2da52dd3d9e863ed2012 100644 (file)
--- a/regression-tests/1dyndns-update-srv/expected_result
+++ b/regression-tests/1dyndns-update-srv/expected_result
@@ -2,7 +2,7 @@
 Rcode: 3, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='srv.test.dyndns.', qtype=SRV
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/1dyndns-update-update-ttl/command b/regression-tests/1dyndns-update-update-ttl/command
index 71de538c7158f5b54380818d4f08f0dddd17c39d..eaf25e65dbeed3c277977facae8a0b9d2d772b17 100755 (executable)
--- a/regression-tests/1dyndns-update-update-ttl/command
+++ b/regression-tests/1dyndns-update-update-ttl/command
@@ -1,7 +1,7 @@
 #!/bin/sh
 cleandig ttl.test.dyndns A
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add ttl.test.dyndns. 31337 A 127.0.0.1
@@ -11,7 +11,7 @@ answer
 
 cleandig ttl.test.dyndns A
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add ttl.test.dyndns. 3600 A 127.0.0.1

diff --git a/regression-tests/1dyndns-update-update-ttl/expected_result b/regression-tests/1dyndns-update-update-ttl/expected_result
index 40fb99d2a77cf800d8004e9902bea81ccf26dcb6..02f8bd04afcfef64e6dd7fe8a146098a464e95c8 100755 (executable)
--- a/regression-tests/1dyndns-update-update-ttl/expected_result
+++ b/regression-tests/1dyndns-update-update-ttl/expected_result
@@ -2,7 +2,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ttl.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='ttl.test.dyndns.', qtype=A
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA

diff --git a/regression-tests/2dyndns-update-replace-soa/command b/regression-tests/2dyndns-update-replace-soa/command
index 360748337a6dc1e463767950d57da182dfb54fcb..634d411ac11524f4ddd15bf854e22f4bafd1846e 100755 (executable)
--- a/regression-tests/2dyndns-update-replace-soa/command
+++ b/regression-tests/2dyndns-update-replace-soa/command
@@ -1,7 +1,7 @@
 #!/bin/sh
 cleandig test.dyndns SOA hidesoadetails
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
@@ -11,7 +11,7 @@ answer
 
 cleandig test.dyndns SOA
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050101000 28800 7200 604800 86400
@@ -21,7 +21,7 @@ answer
 
 cleandig test.dyndns SOA
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050100999 28800 7200 604800 86400
@@ -31,7 +31,7 @@ answer
 
 cleandig test.dyndns SOA
 
-nsupdate <<! | sed 's/\, id:.*/ ID_REPLACED/'
+cleannsupdate <<!
 server $nameserver $port
 zone test.dyndns
 update add test.dyndns. 3600 SOA ns2.test.dyndns. ahu.example.dyndns. 2050101001 28800 7200 604800 86400

diff --git a/regression-tests/2dyndns-update-replace-soa/expected_result b/regression-tests/2dyndns-update-replace-soa/expected_result
index fb1e70c8df882e927dc061410453198b7c1f1726..f0c43bc625e53b756cd703dac63c55603faaee9f 100755 (executable)
--- a/regression-tests/2dyndns-update-replace-soa/expected_result
+++ b/regression-tests/2dyndns-update-replace-soa/expected_result
@@ -2,7 +2,7 @@
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -11,7 +11,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -20,7 +20,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA
@@ -29,7 +29,7 @@ Answer:
 Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='test.dyndns.', qtype=SOA
 Answer:
-;; ->>HEADER<<- opcode: UPDATE, status: NOERROR ID_REPLACED
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
 ;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
 ;; ZONE SECTION:
 ;test.dyndns.                  IN      SOA