From: Stephen Morris <stephen@isc.org>
Date: Thu, 18 Jan 2018 18:11:07 +0000 (+0000)
Subject: [rt46602] Fix EXTRAPORT substitutions in copy_setport
X-Git-Tag: v9.13.0~158^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb78f82ba1da007151518b013be1e2bd49fac03e;p=thirdparty%2Fbind9.git

[rt46602] Fix EXTRAPORT substitutions in copy_setport

Fix problems where all EXTRAPORT macros were being replaced by
the EXTRAPORT1 value. (Copy and paste issue.)
---

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 8ad8db42e6d..458bddc9328 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -251,13 +251,13 @@ nextpart () {
 copy_setports() {
     sed -e "s/@PORT@/${PORT}/g" \
         -e "s/@EXTRAPORT1@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT2@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT3@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT4@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT5@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT6@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT7@/${EXTRAPORT1}/g" \
-        -e "s/@EXTRAPORT8@/${EXTRAPORT1}/g" \
+        -e "s/@EXTRAPORT2@/${EXTRAPORT2}/g" \
+        -e "s/@EXTRAPORT3@/${EXTRAPORT3}/g" \
+        -e "s/@EXTRAPORT4@/${EXTRAPORT4}/g" \
+        -e "s/@EXTRAPORT5@/${EXTRAPORT5}/g" \
+        -e "s/@EXTRAPORT6@/${EXTRAPORT6}/g" \
+        -e "s/@EXTRAPORT7@/${EXTRAPORT7}/g" \
+        -e "s/@EXTRAPORT8@/${EXTRAPORT8}/g" \
         -e "s/@CONTROLPORT@/${CONTROLPORT}/g" $1 > $2
 }