Replace .in with .j2 templates for cases with namedX.conf

The following tests use multiple named configs. Previously, these have
been rendered with copy_setports in tests.sh when needed. Transform
these into jinja2 templates and render them during setup. In the tests,
the copy_setports invocations can be then replaced with a simple cp.

(cherry picked from commit 9d3279a542)

bin/tests/system/acl/setup.sh

@@ -15,6 +15,3 @@
 
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db
 $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/tsigzone.db
-copy_setports ns2/named1.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf

bin/tests/system/acl/tests.sh

@@ -40,7 +40,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 && {
   status=1
 }
 
-copy_setports ns2/named2.conf.in ns2/named.conf
+cp ns2/named2.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 
@@ -72,7 +72,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 && {
 
 echo_i "testing nested ACL processing"
 # all combinations of 10.53.0.{1|2} with key {one|two}, should succeed
-copy_setports ns2/named3.conf.in ns2/named.conf
+cp ns2/named3.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 
@@ -139,7 +139,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 || {
 }
 
 # now we only allow 10.53.0.1 *and* key one, or 10.53.0.2 *and* key two
-copy_setports ns2/named4.conf.in ns2/named.conf
+cp ns2/named4.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 
@@ -189,7 +189,7 @@ grep "^;" dig.out.${t} >/dev/null 2>&1 || {
 }
 
 echo_i "testing allow-query-on ACL processing"
-copy_setports ns2/named5.conf.in ns2/named.conf
+cp ns2/named5.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 sleep 5
 t=$((t + 1))

bin/tests/system/additional/setup.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named1.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf

bin/tests/system/additional/tests.sh

@@ -268,7 +268,7 @@ minimal=yes
 dotests
 
 echo_i "reconfiguring server: minimal-responses no"
-copy_setports ns1/named2.conf.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 echo_i "testing with 'minimal-responses no;'"
@@ -286,7 +286,7 @@ if [ $ret -eq 1 ]; then
 fi
 
 echo_i "reconfiguring server: minimal-any yes"
-copy_setports ns1/named3.conf.in ns1/named.conf
+cp ns1/named3.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 n=$((n + 1))
@@ -324,7 +324,7 @@ minimal=no-auth
 dotests
 
 echo_i "reconfiguring server: minimal-responses no-auth-recursive"
-copy_setports ns1/named4.conf.in ns1/named.conf
+cp ns1/named4.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 echo_i "testing with 'minimal-responses no-auth-recursive;'"
@@ -356,7 +356,7 @@ if [ $ret -eq 1 ]; then
 fi
 
 echo_i "reconfiguring server: minimal-responses no"
-copy_setports ns1/named2.conf.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rndc_reconfig ns1 10.53.0.1
 
 n=$((n + 1))

bin/tests/system/addzone/setup.sh

@@ -17,9 +17,5 @@ cp -f ns1/redirect.db.1 ns1/redirect.db
 cp -f ns2/redirect.db.1 ns2/redirect.db
 cp -f ns3/redirect.db.1 ns3/redirect.db
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named1.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-
 cp -f ns2/default.nzf.in ns2/3bf305731dd26307.nzf
 mkdir ns2/new-zones

bin/tests/system/addzone/tests.sh

@@ -482,8 +482,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "reconfiguring server with multiple views"
-rm -f ns2/named.conf
-copy_setports ns2/named2.conf.in ns2/named.conf
+cp ns2/named2.conf ns2/named.conf
 rndc_reconfig ns2 10.53.0.2
 
 echo_i "adding new zone to external view ($n)"
@@ -608,8 +607,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "reconfiguring server with multiple views and new-zones-directory"
-rm -f ns2/named.conf
-copy_setports ns2/named3.conf.in ns2/named.conf
+cp ns2/named3.conf ns2/named.conf
 rndc_reconfig ns2 10.53.0.2
 
 echo_i "checking new zone is still loaded after dir change ($n)"
@@ -686,7 +684,7 @@ status=$((status + ret))
 echo_i "check delzone after reconfig failure ($n)"
 ret=0
 $RNDCCMD 10.53.0.3 addzone 'inlinesec.example. IN { type secondary; file "inlinesec.db"; masterfile-format text; primaries { test; }; };' >/dev/null 2>&1 || ret=1
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 $RNDCCMD 10.53.0.3 delzone inlinesec.example >/dev/null 2>&1 || ret=1
 n=$((n + 1))

bin/tests/system/allow-query/ns2/controls.conf.j2

@@ -0,0 +1 @@
+../../_common/controls.conf.in

bin/tests/system/allow-query/setup.sh

@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ../_common/controls.conf.in ns2/controls.conf
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named01.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf

bin/tests/system/allow-query/tests.sh

@@ -75,7 +75,7 @@ status=$((status + ret))
 
 # Test 2 - explicit any, query allowed
 n=$((n + 1))
-copy_setports ns2/named02.conf.in ns2/named.conf
+cp ns2/named02.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: explicit any - query allowed"
@@ -88,7 +88,7 @@ status=$((status + ret))
 
 # Test 3 - none, query refused
 n=$((n + 1))
-copy_setports ns2/named03.conf.in ns2/named.conf
+cp ns2/named03.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: none - query refused"
@@ -115,7 +115,7 @@ status=$((status + ret))
 
 # Test 4 - address allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named04.conf.in ns2/named.conf
+cp ns2/named04.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: address allowed - query allowed"
@@ -128,7 +128,7 @@ status=$((status + ret))
 
 # Test 5 - address not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named05.conf.in ns2/named.conf
+cp ns2/named05.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: address not allowed - query refused"
@@ -142,7 +142,7 @@ status=$((status + ret))
 
 # Test 6 - address disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named06.conf.in ns2/named.conf
+cp ns2/named06.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: address disallowed - query refused"
@@ -156,7 +156,7 @@ status=$((status + ret))
 
 # Test 7 - acl allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named07.conf.in ns2/named.conf
+cp ns2/named07.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: acl allowed - query allowed"
@@ -169,7 +169,7 @@ status=$((status + ret))
 
 # Test 8 - acl not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named08.conf.in ns2/named.conf
+cp ns2/named08.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: acl not allowed - query refused"
@@ -183,7 +183,7 @@ status=$((status + ret))
 
 # Test 9 - acl disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named09.conf.in ns2/named.conf
+cp ns2/named09.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: acl disallowed - query refused"
@@ -197,7 +197,7 @@ status=$((status + ret))
 
 # Test 10 - key allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named10.conf.in ns2/named.conf
+cp ns2/named10.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: key allowed - query allowed"
@@ -210,7 +210,7 @@ status=$((status + ret))
 
 # Test 11 - key not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named11.conf.in ns2/named.conf
+cp ns2/named11.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: key not allowed - query refused"
@@ -224,7 +224,7 @@ status=$((status + ret))
 
 # Test 12 - key disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named12.conf.in ns2/named.conf
+cp ns2/named12.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: key disallowed - query refused"
@@ -241,7 +241,7 @@ status=$((status + ret))
 n=20
 # Test 21 - views default, query allowed
 n=$((n + 1))
-copy_setports ns2/named21.conf.in ns2/named.conf
+cp ns2/named21.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views default - query allowed"
@@ -254,7 +254,7 @@ status=$((status + ret))
 
 # Test 22 - views explicit any, query allowed
 n=$((n + 1))
-copy_setports ns2/named22.conf.in ns2/named.conf
+cp ns2/named22.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views explicit any - query allowed"
@@ -267,7 +267,7 @@ status=$((status + ret))
 
 # Test 23 - views none, query refused
 n=$((n + 1))
-copy_setports ns2/named23.conf.in ns2/named.conf
+cp ns2/named23.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views none - query refused"
@@ -281,7 +281,7 @@ status=$((status + ret))
 
 # Test 24 - views address allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named24.conf.in ns2/named.conf
+cp ns2/named24.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views address allowed - query allowed"
@@ -294,7 +294,7 @@ status=$((status + ret))
 
 # Test 25 - views address not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named25.conf.in ns2/named.conf
+cp ns2/named25.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views address not allowed - query refused"
@@ -308,7 +308,7 @@ status=$((status + ret))
 
 # Test 26 - views address disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named26.conf.in ns2/named.conf
+cp ns2/named26.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views address disallowed - query refused"
@@ -322,7 +322,7 @@ status=$((status + ret))
 
 # Test 27 - views acl allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named27.conf.in ns2/named.conf
+cp ns2/named27.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views acl allowed - query allowed"
@@ -335,7 +335,7 @@ status=$((status + ret))
 
 # Test 28 - views acl not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named28.conf.in ns2/named.conf
+cp ns2/named28.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views acl not allowed - query refused"
@@ -349,7 +349,7 @@ status=$((status + ret))
 
 # Test 29 - views acl disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named29.conf.in ns2/named.conf
+cp ns2/named29.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views acl disallowed - query refused"
@@ -363,7 +363,7 @@ status=$((status + ret))
 
 # Test 30 - views key allowed, query allowed
 n=$((n + 1))
-copy_setports ns2/named30.conf.in ns2/named.conf
+cp ns2/named30.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views key allowed - query allowed"
@@ -376,7 +376,7 @@ status=$((status + ret))
 
 # Test 31 - views key not allowed, query refused
 n=$((n + 1))
-copy_setports ns2/named31.conf.in ns2/named.conf
+cp ns2/named31.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views key not allowed - query refused"
@@ -390,7 +390,7 @@ status=$((status + ret))
 
 # Test 32 - views key disallowed, query refused
 n=$((n + 1))
-copy_setports ns2/named32.conf.in ns2/named.conf
+cp ns2/named32.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views key disallowed - query refused"
@@ -404,7 +404,7 @@ status=$((status + ret))
 
 # Test 33 - views over options, views allow, query allowed
 n=$((n + 1))
-copy_setports ns2/named33.conf.in ns2/named.conf
+cp ns2/named33.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views allow - query allowed"
@@ -417,7 +417,7 @@ status=$((status + ret))
 
 # Test 34 - views over options, views disallow, query refused
 n=$((n + 1))
-copy_setports ns2/named34.conf.in ns2/named.conf
+cp ns2/named34.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views disallow - query refused"
@@ -435,7 +435,7 @@ n=40
 
 # Test 41 - zone default, query allowed
 n=$((n + 1))
-copy_setports ns2/named40.conf.in ns2/named.conf
+cp ns2/named40.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zone default - query allowed"
@@ -565,7 +565,7 @@ status=$((status + ret))
 
 # Test 53 - zones over options, zones allow, query allowed
 n=$((n + 1))
-copy_setports ns2/named53.conf.in ns2/named.conf
+cp ns2/named53.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views allow - query allowed"
@@ -578,7 +578,7 @@ status=$((status + ret))
 
 # Test 54 - zones over options, zones disallow, query refused
 n=$((n + 1))
-copy_setports ns2/named54.conf.in ns2/named.conf
+cp ns2/named54.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: views over options, views disallow - query refused"
@@ -592,7 +592,7 @@ status=$((status + ret))
 
 # Test 55 - zones over views, zones allow, query allowed
 n=$((n + 1))
-copy_setports ns2/named55.conf.in ns2/named.conf
+cp ns2/named55.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zones over views, views allow - query allowed"
@@ -605,7 +605,7 @@ status=$((status + ret))
 
 # Test 56 - zones over views, zones disallow, query refused
 n=$((n + 1))
-copy_setports ns2/named56.conf.in ns2/named.conf
+cp ns2/named56.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zones over views, views disallow - query refused"
@@ -619,7 +619,7 @@ status=$((status + ret))
 
 # Test 57 - zones over views, zones disallow, query refused (allow-query-on)
 n=$((n + 1))
-copy_setports ns2/named57.conf.in ns2/named.conf
+cp ns2/named57.conf ns2/named.conf
 rndc_reload ns2 10.53.0.2
 
 echo_i "test $n: zones over views, allow-query-on"
@@ -663,7 +663,7 @@ status=$((status + ret))
 
 # Test 60 - block recursion-on, allow query-cache-on
 n=$((n + 1))
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: block recursion-on, allow query-cache-on"
@@ -682,7 +682,7 @@ status=$((status + ret))
 
 # Test 61 - inheritance of allow-query-cache-on from allow-recursion-on
 n=$((n + 1))
-copy_setports ns3/named3.conf.in ns3/named.conf
+cp ns3/named3.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: inheritance of allow-query-cache-on"
@@ -709,7 +709,7 @@ status=$((status + ret))
 
 # Test 62 - inheritance of allow-recursion-on from allow-query-cache-on
 n=$((n + 1))
-copy_setports ns3/named4.conf.in ns3/named.conf
+cp ns3/named4.conf ns3/named.conf
 rndc_reload ns3 10.53.0.3
 
 echo_i "test $n: inheritance of allow-recursion-on"

bin/tests/system/dns64/setup.sh

@@ -13,9 +13,4 @@
 
 . ../conf.sh
 
-copy_setports ns1/named.conf1.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-
 cd ns1 && $SHELL sign.sh

bin/tests/system/dns64/tests.sh

@@ -1407,7 +1407,7 @@ n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns1/named.conf2.in ns1/named.conf
+cp ns1/named2.conf ns1/named.conf
 rndc_reload ns1 10.53.0.1
 
 echo_i "checking 'dig +dns64prefix' with multiple prefixes ($n)"
@@ -1419,7 +1419,7 @@ n=$((n + 1))
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns1/named.conf3.in ns1/named.conf
+cp ns1/named3.conf ns1/named.conf
 rndc_reload ns1 10.53.0.1
 
 echo_i "checking 'dig +dns64prefix' with no prefixes ($n)"

bin/tests/system/dnssec/setup.sh

@@ -16,19 +16,6 @@
 
 set -e
 
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-
-copy_setports ns4/named1.conf.in ns4/named.conf
-copy_setports ns5/named1.conf.in ns5/named.conf
-
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf
-copy_setports ns8/named.conf.in ns8/named.conf
-
-copy_setports ns9/named.conf.in ns9/named.conf
-
 (
   cd ns1
   $SHELL sign.sh

bin/tests/system/dnssec/tests.sh

@@ -2760,7 +2760,7 @@ status=$((status + ret))
 # correctly.
 echo_i "switching to automatic root key configuration"
 cp ns4/managed-keys.bind.in ns4/managed-keys.bind
-copy_setports ns4/named2.conf.in ns4/named.conf
+cp ns4/named2.conf ns4/named.conf
 rndccmd 10.53.0.4 reconfig 2>&1 | sed 's/^/ns4 /' | cat_i
 sleep 5
 
@@ -3158,7 +3158,7 @@ n=$((n + 1))
 test "$ret" -eq 0 || echo_i "failed"
 status=$((status + ret))
 
-copy_setports ns4/named3.conf.in ns4/named.conf
+cp ns4/named3.conf ns4/named.conf
 rndccmd 10.53.0.4 reconfig 2>&1 | sed 's/^/ns4 /' | cat_i
 sleep 3
 
@@ -3391,7 +3391,7 @@ EOF
   status=$((status + ret))
 fi
 
-copy_setports ns4/named4.conf.in ns4/named.conf
+cp ns4/named4.conf ns4/named.conf
 rndccmd 10.53.0.4 reconfig 2>&1 | sed 's/^/ns4 /' | cat_i
 sleep 3
 
@@ -3889,7 +3889,7 @@ status=$((status + ret))
 
 echo_i "checking initialization with a revoked managed key ($n)"
 ret=0
-copy_setports ns5/named2.conf.in ns5/named.conf
+cp ns5/named2.conf ns5/named.conf
 rndccmd 10.53.0.5 reconfig 2>&1 | sed 's/^/ns5 /' | cat_i
 sleep 3
 dig_with_opts +dnssec @10.53.0.5 SOA . >dig.out.ns5.test$n

bin/tests/system/fetchlimit/setup.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-copy_setports ns5/named1.conf.in ns5/named.conf

bin/tests/system/fetchlimit/tests.sh

@@ -166,7 +166,7 @@ quota=$2
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns3/named2.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 
 n=$((n + 1))
@@ -209,7 +209,7 @@ drops=$(grep 'queries dropped' ns3/named.stats | sed 's/\([0-9][0-9]*\) queries.
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
-copy_setports ns3/named3.conf.in ns3/named.conf
+cp ns3/named3.conf ns3/named.conf
 rndc_reconfig ns3 10.53.0.3
 
 n=$((n + 1))
@@ -298,7 +298,7 @@ status=$((status + ret))
 
 echo_i "stop ns5"
 stop_server --use-rndc --port ${CONTROLPORT} ns5
-copy_setports ns5/named2.conf.in ns5/named.conf
+cp ns5/named2.conf ns5/named.conf
 echo_i "start ns5"
 start_server --noclean --restart --port ${PORT} ns5
 
@@ -342,7 +342,7 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "checking a warning is logged if max-clients-per-query < clients-per-query ($n)"
 ret=0
-copy_setports ns5/named3.conf.in ns5/named.conf
+cp ns5/named3.conf ns5/named.conf
 rndc_reconfig ns5 10.53.0.5
 wait_for_message ns5/named.run "configured clients-per-query (10) exceeds max-clients-per-query (5); automatically adjusting max-clients-per-query to (10)" || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi