From: Miod Vallat <miod.vallat@powerdns.com>
Date: Wed, 16 Jul 2025 10:34:11 +0000 (+0200)
Subject: Correctly recognize *-nsec3-optout-variant as "optout".
X-Git-Tag: rec-5.4.0-alpha0~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15850%2Fhead;p=thirdparty%2Fpdns.git

Correctly recognize *-nsec3-optout-variant as "optout".

Fixes: #15846

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>
---

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index cd9c0e6c0b..e99c0155d9 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -290,7 +290,13 @@ fi
 optout=0
 pkcs11=0
 
-if [ "${context: -13}" = "-nsec3-optout" ]
+if [ "${context: -8}" = "-variant" ]
+then
+	subcontext=${context%-variant}
+else
+	subcontext=${context}
+fi
+if [ "${subcontext: -13}" = "-nsec3-optout" ]
 then
         optout=1
 fi
diff --git a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.lmdb-nsec3-optout-variant b/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.lmdb-nsec3-optout-variant
deleted file mode 120000
index b9fe5f8d68..0000000000
--- a/regression-tests/tests/1dyndns-update-nsec3params-with-others/expected_result.lmdb-nsec3-optout-variant
+++ /dev/null
@@ -1 +0,0 @@
-expected_result.nsec3
\ No newline at end of file