From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 11 Feb 2013 15:00:49 +0000 (+0100)
Subject: use cleannsupdate
X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb724939f4eefdd35e6150a203e0405cc9e61f9f;p=thirdparty%2Fpdns.git

use cleannsupdate
---

diff --git a/regression-tests/0dyndns-prereq-all/command b/regression-tests/0dyndns-prereq-all/command
index 409228b8a4..b90cab9aca 100755
--- 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 f570a26f63..512bc4ce5b 100644
--- 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 b032800f20..e8291930be 100755
--- 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 729afea638..e068c933bc 100644
--- 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 3c33e97a48..5aaf00bcbd 100755
--- 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 bd7d12eb38..396672cff5 100755
--- 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 a096d66c4f..e50de512fe 100644
--- 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 ff6acb2127..5c212a595c 100755
--- 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 ddba2262f4..9dc25bab4f 100644
--- 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 1ef72008f0..0e2058703f 100755
--- 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 50ab00949a..5cc2de35e6 100644
--- 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 aadd4fe7a6..905ecc44ec 100755
--- 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 25d8bb1b9a..2167a1a5ab 100644
--- 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 703e221864..15dc63b016 100755
--- 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 dd87fbf67e..d296fbbd5f 100644
--- 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 1ddc3000f8..b3a6f44cc5 100755
--- 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 9b038bd8b5..d08142eab1 100755
--- 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 deab4ffeb3..2dcf8de483 100755
--- 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 5fe2795fcc..649d99aacd 100755
--- 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 5f24e2bafd..bf74012a4a 100755
--- 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 557ddc6975..4921bb8129 100755
--- 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 0063a52559..b81135ee52 100755
--- 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 ce7dc86f57..de3934a933 100755
--- 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 d2d051f3cb..7b20f0d6fc 100755
--- 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 3ce1c683f0..41153246a6 100644
--- 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 f694ce6970..32b6bc31e9 100755
--- 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 484018277f..caa023dd93 100755
--- 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 090ab903b7..c097d2609f 100755
--- 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 9d979b0f56..122320733d 100755
--- 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 3265ea5c31..34a0573d36 100755
--- 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 91dc864fe9..f475980286 100755
--- 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 857cf7cb7b..76d65aeb2e 100755
--- 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 e8ae0f0d1d..9f8a14b786 100644
--- 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 48e90d257b..17bd7c818f 100755
--- 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 5a32bd2c15..a58ec44d0b 100755
--- 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 dba48213e8..52bbeddd20 100755
--- 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 2e5238081a..09d66898f7 100644
--- 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 0a4d16c7a0..78f2ba0c5f 100755
--- 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 8506f83141..08f71ead7b 100644
--- 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 71de538c71..eaf25e65db 100755
--- 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 40fb99d2a7..02f8bd04af 100755
--- 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 360748337a..634d411ac1 100755
--- 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 fb1e70c8df..f0c43bc625 100755
--- 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