From 425af8d0b1e0fabdbbe78aa60d3fa5ece13c6f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Fri, 5 Dec 2025 17:18:20 +0100 Subject: [PATCH] Use jinja2 templates in tsiggss - The ns1/named.conf.j2 contains "@" which is a special jinja character, use the raw directive to escape it. (cherry picked from commit 1aa2f7249a5c5bc36397fe0f9d89cef4d37ed817) --- bin/tests/system/tsiggss/ns1/{named.conf.in => named.conf.j2} | 2 ++ bin/tests/system/tsiggss/setup.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) rename bin/tests/system/tsiggss/ns1/{named.conf.in => named.conf.j2} (98%) diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.j2 similarity index 98% rename from bin/tests/system/tsiggss/ns1/named.conf.in rename to bin/tests/system/tsiggss/ns1/named.conf.j2 index 7b34c3297f..4220564daa 100644 --- a/bin/tests/system/tsiggss/ns1/named.conf.in +++ b/bin/tests/system/tsiggss/ns1/named.conf.j2 @@ -39,11 +39,13 @@ zone "example.nil." IN { type primary; file "example.nil.db"; +{% raw %} update-policy { grant Administrator@EXAMPLE.NIL wildcard * A AAAA SRV CNAME; grant testdenied@EXAMPLE.NIL wildcard * TXT; grant "local:auth.sock" external * CNAME; }; +{% endraw %} /* we need to use check-names ignore so _msdcs A records can be created */ check-names ignore; diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh index af9dcfe191..649528aa59 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/setup.sh @@ -13,7 +13,5 @@ . ../conf.sh -copy_setports ns1/named.conf.in ns1/named.conf - key=$($KEYGEN -Cq -K ns1 -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n HOST -T KEY key.example.nil.) cat ns1/example.nil.db.in ns1/${key}.key >ns1/example.nil.db