From: tcely <tcely@users.noreply.github.com>
Date: Sun, 6 Aug 2017 07:03:40 +0000 (-0400)
Subject: Added address variable. Issue #2835.
X-Git-Tag: auth-4.1.0-rc1~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98e8981c505280ca58c4b7f5fd38094508d05fc6;p=thirdparty%2Fpdns.git

Added address variable. Issue #2835.
---

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index 7a0088776c..f051d0d1e3 100644
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -7,7 +7,7 @@ bind-config=./named.conf
 bind-ignore-broken-records=yes
 __EOF__
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 			--config-name=bind --socket-dir=./ --no-shuffle \
 			--cache-ttl=$cachettl --dname-processing \
 			--disable-axfr-rectify=yes &
@@ -88,7 +88,7 @@ __EOF__
 			skipreasons="nodyndns noalias nsec"
 		fi
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 			--config-name=bind --socket-dir=./ --no-shuffle \
 			--cache-ttl=$cachettl --dname-processing \
 			--disable-axfr-rectify=yes $lua_prequery &
diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index 0397e138cf..a173675963 100644
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -84,7 +84,7 @@ EOF
 
 		base64 -d < $testsdir/GeoLiteCity.dat.b64 > $testsdir/GeoLiteCity.dat
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
 			--no-shuffle --launch=geoip \
 			--cache-ttl=$cachettl --dname-processing --no-config \
 			--distributor-threads=1 \
diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 5ccdc85e8b..af1a10f552 100644
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -35,7 +35,7 @@ gsql_master()
 	done
 
 
-	$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+	$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 		--config-name=$backend --socket-dir=./ --no-shuffle \
 		--dnsupdate=yes --resolver=8.8.8.8 --outgoing-axfr-expand-alias=yes \
 		--expand-alias=yes \
diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index a4fbc8329b..25138b9b21 100644
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -24,7 +24,7 @@ ldap-secret=$LDAPPASSWD
 ldap-method=$layout
 __EOF__
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 			--config-name=ldap --socket-dir=./ --no-shuffle \
 			--query-logging \
 			--cache-ttl=$cachettl --dname-processing $lua_prequery &
diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master
index d141a9bbd0..4bf6cbe659 100644
--- a/regression-tests/backends/mydns-master
+++ b/regression-tests/backends/mydns-master
@@ -22,7 +22,7 @@ mydns-user=$MYDNSUSER
 mydns-host=$MYDNSHOST
 mydns-password=$MYDNSPASSWD
 __EOF__
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
 			--config-dir=. --config-name=mydns \
 			--no-shuffle --master \
 			--cache-ttl=0 --dname-processing \
diff --git a/regression-tests/backends/opendbx-master b/regression-tests/backends/opendbx-master
index 23c8dc7e36..e19dd7868d 100644
--- a/regression-tests/backends/opendbx-master
+++ b/regression-tests/backends/opendbx-master
@@ -7,7 +7,7 @@ case $context in
 			ALTER TABLE domains ADD auto_serial INTEGER DEFAULT 0;"
 		echo ANALYZE\; | sqlite3 pdns-opendbx.sqlite3
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./  \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./  \
 			--no-shuffle --launch=opendbx \
 			--cache-ttl=$cachettl --dname-processing --no-config \
 			--opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \
diff --git a/regression-tests/backends/oracle-master b/regression-tests/backends/oracle-master
index 8b77d278b7..141f0f37ba 100644
--- a/regression-tests/backends/oracle-master
+++ b/regression-tests/backends/oracle-master
@@ -46,7 +46,7 @@ __EOF__
 		$PDNSUTIL --config-dir=. --config-name=oracle import-tsig-key test $ALGORITHM $KEY
 		$PDNSUTIL --config-dir=. --config-name=oracle activate-tsig-key tsig.com test master
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --config-dir=. \
 			--config-name=oracle --socket-dir=./ --no-shuffle \
 			--query-logging \
 			--cache-ttl=$cachettl --dname-processing $lua_prequery &
diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 69a20076c4..3aeecf9f2e 100644
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -109,7 +109,7 @@ EOF
 			cp -f $testsdir/list-all-records/expected_result.dnssec $testsdir/list-all-records/expected_result.nsec3
 		fi
 
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
 			--no-shuffle --launch=remote \
 			--cache-ttl=$cachettl --dname-processing --no-config \
 			--distributor-threads=1 \
diff --git a/regression-tests/backends/tinydns-master b/regression-tests/backends/tinydns-master
index 0fd842b400..3ebafbf74e 100644
--- a/regression-tests/backends/tinydns-master
+++ b/regression-tests/backends/tinydns-master
@@ -1,6 +1,6 @@
 case $context in
 	tinydns)
-		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
+		$RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \
 			--no-shuffle --launch=tinydns \
 		 --cache-ttl=$cachettl --dname-processing --no-config \
 			--dnsupdate=yes \
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 5155d56fea..49c2faac37 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -151,6 +151,7 @@ then
 	exit
 fi
 
+address='127.0.0.1'
 port=$1
 [ -z "$port" ] && port=5300
 context=$2
@@ -307,6 +308,7 @@ dotests () {
 
 RETVAL=0
 
+export address
 export port
 export context
 export extracontexts