From: Stephen Morris <stephen@isc.org>
Date: Thu, 25 Jan 2018 14:45:49 +0000 (+0000)
Subject: [rt46602] Escape line ends in shell script variable assignment
X-Git-Tag: v9.11.4rc1~113^2~18
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=53ebdf225f9389ef8128d273230865e496787dba;p=thirdparty%2Fbind9.git

[rt46602] Escape line ends in shell script variable assignment

Escape the line ends in a multi-line variable assignment.  Under some
circumstances, substituting the variable caused syntax errors when
used as the list of values in a shell script "for" statement.

(cherry picked from commit 462766cd763413c4a0d069b7adf2e65816851493)
---

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index fcd06d66b33..0536aeaae63 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -76,20 +76,21 @@ KRB5_CONFIG=/dev/null
 #
 # List of tests that use ports 5300 and 9953.  For this reason, these must
 # be run sequentially.
-SEQUENTIALDIRS="acl additional addzone auth autosign builtin
-	 cacheclean case cds chain
-         checkconf @CHECKDS@ checknames checkzone cookie @COVERAGE@
-         database digdelv dlv dlz dlzexternal
-	 dns64 dnssec @DNSTAP@ dscp dsdigest dyndb ecdsa eddsa
-	 ednscompliance emptyzones fetchlimit filter-aaaa formerr
-	 forward geoip glue gost inline integrity ixfr @KEYMGR@
-	 legacy limits logfileconfig lwresd masterfile masterformat
-	 metadata mkeys names notify nslookup nsupdate nzd2nzf
-	 pending @PKCS11_TEST@ pipelined reclimit redirect resolver
-	 rndc rpz rpzrecurse rrchecker rrl rrsetorder rsabigexponent
-	 runtime sfcache smartsign sortlist spf staticstub statistics
-	 statschannel stub tcp tkey tsig tsiggss unknown upforwd
-	 verify views wildcard xfer xferquota zero zonechecks"
+SEQUENTIALDIRS="acl additional addzone auth autosign builtin \
+	cacheclean case cds chain \
+	checkconf @CHECKDS@ checknames checkzone cookie @COVERAGE@ \
+	database digdelv dlv dlz dlzexternal \
+	dns64 dnssec @DNSTAP@ dscp dsdigest dyndb ecdsa eddsa \
+	emptyzones fetchlimit filter-aaaa formerr geoip glue gost \
+	inline integrity ixfr keepalive @KEYMGR@ legacy limits \
+	logfileconfig masterfile masterformat metadata mkeys \
+	names notify nslookup nsupdate nzd2nzf padding pending \
+	pipelined @PKCS11_TEST@ reclimit redirect resolver rndc \
+	rpz rrchecker rrl rrsetorder rsabigexponent \
+	runtime sfcache smartsign sortlist spf staticstub \
+	statistics statschannel stub synthfromdnssec tcp tkey tools \
+	tsig tsiggss unknown upforwd verify views wildcard xfer \
+	xferquota zero zonechecks"
 
 # List of tests that use unique ports (other than 5300 and 9953). These
 # tests can be run in parallel.