ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Rename start() and stop() to start_server() and stop_server()

Browse Source 
On OpenBSD, there's non-POSIX alias from stop to kill that breaks
the conf.sh.common script.
This commit is contained in:
Ondřej Surý
2020-05-01 10:14:21 +02:00
parent 5b7fccd28d
commit 370a335d51
19 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tests/system/inline/tests.sh
View File

@@ -468,14 +468,14 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "stop bump in the wire signer server ($n)"
ret=0
stop inline ns3 || ret=1
stop_server inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "restart bump in the wire signer server ($n)"
ret=0
start --noclean --restart --port ${PORT} inline ns3 || ret=1
start_server --noclean --restart --port ${PORT} inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
@@ -882,7 +882,7 @@ status=`expr $status + $ret`
n=`expr $n + 1`
echo_i "stop bump in the wire signer server ($n)"
ret=0
stop inline ns3 || ret=1
stop_server inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
@@ -893,7 +893,7 @@ rm ns3/master.db.jnl
n=`expr $n + 1`
echo_i "restart bump in the wire signer server ($n)"
ret=0
start --noclean --restart --port ${PORT} inline ns3 || ret=1
start_server --noclean --restart --port ${PORT} inline ns3 || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
@@ -1342,7 +1342,7 @@ retry_quiet 10 check_done_signing || ret=1
# flushed upon shutdown since we specifically want to avoid it.
$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3
ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed
start --noclean --restart --port ${PORT} inline ns3
start_server --noclean --restart --port ${PORT} inline ns3
# At this point, the raw zone journal will not have a source serial set. Upon
# server startup, receive_secure_serial() will rectify that, update SOA, resign
# it, and schedule its future resign. This will cause "rndc zonestatus" to
@@ -1352,7 +1352,7 @@ start --noclean --restart --port ${PORT} inline ns3
$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3
ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed
nextpart ns3/named.run > /dev/null
start --noclean --restart --port ${PORT} inline ns3
start_server --noclean --restart --port ${PORT} inline ns3
# We can now test whether the secure zone journal was correctly processed:
# unless the records contained in it were scheduled for resigning, no resigning
# event will be scheduled at all since the secure zone master file contains no