git: 1da99b479a74 - main - syslogd tests: Permit starting syslogd with multiple -b options

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Fri, 03 Jan 2025 01:53:16 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=1da99b479a741a49bfa9188925bca52345b67e68

commit 1da99b479a741a49bfa9188925bca52345b67e68
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-01-03 01:50:59 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-01-03 01:50:59 +0000

    syslogd tests: Permit starting syslogd with multiple -b options
---
 usr.sbin/syslogd/tests/syslogd_test_common.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh
index f37846af0430..34099684a1c2 100644
--- a/usr.sbin/syslogd/tests/syslogd_test_common.sh
+++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh
@@ -19,7 +19,7 @@ readonly SYSLOGD_LOCAL_PRIVSOCKET="${PWD}/logpriv.sock"
 # Start a private syslogd instance.
 syslogd_start()
 {
-    local jail bind_addr conf_file pid_file socket privsocket
+    local jail bind_arg conf_file pid_file socket privsocket
     local opt next other_args
 
     # Setup loopback so we can deliver messages to ourself.
@@ -29,7 +29,7 @@ syslogd_start()
     while getopts ":b:f:j:P:p:S:" opt; do
         case "${opt}" in
         b)
-            bind_addr="${OPTARG}"
+            bind_arg="${bind_arg} -b ${OPTARG}"
             ;;
         f)
             conf_file="${OPTARG}"
@@ -71,7 +71,7 @@ syslogd_start()
     done
 
     $jail syslogd \
-        -b "${bind_addr:-":${SYSLOGD_UDP_PORT}"}" \
+        ${bind_arg:--b :${SYSLOGD_UDP_PORT}} \
         -C \
         -d \
         -f "${conf_file:-${SYSLOGD_CONFIG}}" \