From 74d493b9611c9ac9a9692a8ab888679f965c6f33 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 17 May 2019 15:09:50 +0200
Subject: [PATCH] auth: Check that an ENT is properly removed by an UPDATE

---
 .../tests/1dyndns-cname-and-other-data/command | 18 ++++++++++++++++++
 .../expected_result                            | 14 ++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/regression-tests/tests/1dyndns-cname-and-other-data/command b/regression-tests/tests/1dyndns-cname-and-other-data/command
index 32ef5676e0..39f77560b9 100755
--- a/regression-tests/tests/1dyndns-cname-and-other-data/command
+++ b/regression-tests/tests/1dyndns-cname-and-other-data/command
@@ -19,6 +19,15 @@ echo '* check that indeed nothing was added'
 cleandig $RECORDNAME A hidesoadetails
 cleandig $RECORDNAME CNAME hidesoadetails
 
+echo '* Add a record that will result in an ENT being inserted at the upcoming CNAME'
+cleannsupdate <<!
+server $nameserver $port
+zone test.dyndns
+update add sub.$RECORDNAME. 3600 A 192.0.2.1
+send
+answer
+!
+
 echo '* Add a CNAME'
 cleannsupdate <<!
 server $nameserver $port
@@ -28,6 +37,15 @@ send
 answer
 !
 
+echo '* Delete the now useless record inserted to get an ENT there'
+cleannsupdate <<!
+server $nameserver $port
+zone test.dyndns
+update delete sub.$RECORDNAME. 3600 A 192.0.2.1
+send
+answer
+!
+
 echo '* Attempt to add an A record (should be REFUSED)'
 cleannsupdate <<!
 server $nameserver $port
diff --git a/regression-tests/tests/1dyndns-cname-and-other-data/expected_result b/regression-tests/tests/1dyndns-cname-and-other-data/expected_result
index 6cee2c4900..371bdf9fde 100644
--- a/regression-tests/tests/1dyndns-cname-and-other-data/expected_result
+++ b/regression-tests/tests/1dyndns-cname-and-other-data/expected_result
@@ -16,6 +16,13 @@ Reply to question for qname='cname-and-other.test.dyndns.', qtype=A
 1	test.dyndns.	IN	SOA	3600	ns1.test.dyndns. ahu.example.dyndns. [serial] 28800 7200 604800 86400
 Rcode: 3 (Non-Existent domain), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='cname-and-other.test.dyndns.', qtype=CNAME
+* Add a record that will result in an ENT being inserted at the upcoming CNAME
+Answer:
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
+;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
+;; ZONE SECTION:
+;test.dyndns.			IN	SOA
+
 * Add a CNAME
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
@@ -23,6 +30,13 @@ Answer:
 ;; ZONE SECTION:
 ;test.dyndns.			IN	SOA
 
+* Delete the now useless record inserted to get an ENT there
+Answer:
+;; ->>HEADER<<- opcode: UPDATE, status: NOERROR, id: [id]
+;; flags: qr aa; ZONE: 1, PREREQ: 0, UPDATE: 0, ADDITIONAL: 0
+;; ZONE SECTION:
+;test.dyndns.			IN	SOA
+
 * Attempt to add an A record (should be REFUSED)
 Answer:
 ;; ->>HEADER<<- opcode: UPDATE, status: REFUSED, id: [id]
-- 
2.47.2