From nobody Fri Jan 03 01:53:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YPRRw3tLxz5kFhX; Fri, 03 Jan 2025 01:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPRRw3Rb1z4RBv; Fri, 3 Jan 2025 01:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aEFQCWN5xbFArmuJHQis+/8Se8ujrHSvVE6pFEsJGGY=; b=CO19av7Ng8I0PawWNsFJTudX7vB9/AVycS5yinL7VCL7TzEuAKAsGAjrRPka9c7JirZxnu 726CMspvaD0612Bdck5+tn4HLNuwkoKHGtK8Il4Pid9FiWvkUUsAI19b4hHsCkL87lNO6N hz5J+VqlzQWkj/Cygh2pjRswyXTkQjks1t3T+xM9vOPqrdt6xtzZuSkJYVwmTzavSuAMO2 gJmxYih8VspmGM5FumunmOKxADEQ3M6/CjtHIYaCYnNg8t3bkdBvXXDUOpgqdqiFBclOL/ xqznfxyGTBNsGevcpnZ1uNq1FGuI0nd+txsXk4iVMSzxYip+wgpqbnzszvE3TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735869196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aEFQCWN5xbFArmuJHQis+/8Se8ujrHSvVE6pFEsJGGY=; b=QO/bHmTe3+jipezRB5VUjIra9BmWz9EUyHMTcEh6QA3OIVCCuoMkQTTdT490sMLIjiuLsE HrUAPwf+WulOW899MVamhmYPskiaL6F0wdbhvuhg3apmb7AlUluN2jeBj0nWONQVkyZAUx JscDsuTaq9tah0qi1YTeiXNuYk9HlsmFpkbe4IZh/OgbL6444wlPYVjVNGoRBawEEVOzsm irUSYHTPq15iMSNkymS0mHlr3SS/g7UiEUVtovi83LwOe3gacrPBCjkZorCra6OGtNPr4q O1fSts26A0xvDehAwWewqscgUT0Hh9RdoyRWUu3CzHx02v1hOsppfSd6ZeIvhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735869196; a=rsa-sha256; cv=none; b=eRXjACFMIc33f9PmiSlDWBgUbsL1JZozEI6hDZ/wnCTVcOAZgN2qfpMQsG3RQbRwjKEzFJ DD64+nlM92hJCZsi7Dxkj/ZzSJ6ZdISiN0WaIS+FKotlwtlq+naxhtUU300Vf9qtE/JG2G Ok+/7W6CYEBiL7p+HkuVFPQojKut9T9+rvecK5TRc0pg92jON2QUV13A5ztMYe5DcgrMbH 2glclGAXW51j28OXbLusJAIE0NPe5RQwwJhi9yQMJIO7+uE/8NT9d0rVmz3TlfwZzDjmaM 6Y88cFRY83ljiWhl6q7wJaRGuKjV2Ju6YrLfWMx2SF2ZN7w5UtgHYS1t0uN+vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YPRRw33RHz12SB; Fri, 03 Jan 2025 01:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5031rGW6008691; Fri, 3 Jan 2025 01:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5031rGZr008688; Fri, 3 Jan 2025 01:53:16 GMT (envelope-from git) Date: Fri, 3 Jan 2025 01:53:16 GMT Message-Id: <202501030153.5031rGZr008688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1da99b479a74 - main - syslogd tests: Permit starting syslogd with multiple -b options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da99b479a741a49bfa9188925bca52345b67e68 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1da99b479a741a49bfa9188925bca52345b67e68 commit 1da99b479a741a49bfa9188925bca52345b67e68 Author: Mark Johnston AuthorDate: 2025-01-03 01:50:59 +0000 Commit: Mark Johnston 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}}" \