From nobody Thu Jan 22 17:17:57 2026 X-Original-To: dev-commits-src-all@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 4dxnnd2qMCz6Q4Vs for ; Thu, 22 Jan 2026 17:17:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxnnd1XYLz3f8p for ; Thu, 22 Jan 2026 17:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102277; 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=hk4Ge8N5nilOyGa+gKX9srKUsE5v0P4vd0W5YP37a3Y=; b=mRIeFwkSj/qg/58PWkwkr9ydCHa0dtNG1RjUTOOMbrHX/WYLkkteKKA7F9NUo5ZPQykjfQ TaNYp3LqJJAYeiu6kOGif8pD+fv9TkYRHXWcRXB4pPvnXSpFFo+4wceaClCJqcYRoXdvA2 ikyzG+7K8VPUtP4/CFKgmSXJ1J8Gk/SRI9GkW1ie4PUUUVVDWTEIFilM+1WBkIvIfn3zV4 fCwD6vdQAExwvAaBsrxvnVAg8B02Os2raYqA98mX0d3wzdyL5jNv1RDOKdSMqsGt0sL+/2 Mp/ckaxthOVx24t6lQ4ht5OUHvvd56NbCXYVEWFjMxVzXaD/LKh+vvmH8GmWdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102277; 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=hk4Ge8N5nilOyGa+gKX9srKUsE5v0P4vd0W5YP37a3Y=; b=Rb7Z8Ucqtj/HQr050pzQZ1rZ2y5Nyo2CuZeXWLBjCh+3eifqewlTE1sIffUx5bXhCW3Jjv QPcONkbVpSFVFF5ApI9oU6Xi7kVajEiP6urDYXs1f++Xq2O3fJqgKpItixJvJHKhD26FGL vjI7c7Lzi/sTTMn0oyXbjOwBKdtrHNoUBfpLMuavHM9eruaF8sWUZv1/062nKofg9ynUhx xCYmWz01jVXAp8eB2s6dItfCO3jvzgSvMesa3cVx2DY2V05N92DH4QjGXVg50qnkgcHKVJ PWsjYBSTxtfuEybfx+DP2iwCnccVFPDE4krSu+A07oRSyFCejxj28b/Pq6KMtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769102277; a=rsa-sha256; cv=none; b=EnDucONeL3/tZ/rvlgNMxf3gy1oTXtEFdFr8jKVc3maXkP/cXdoRdzwpcJd+YpADxLXORY t2D5PpQxnD9wQXpUdh3yAVvfvRdk746HCFqhm7cPcPWXBU8Kwp4yM1PChYqVwiDOF16fp+ oWOav+3oDrDdQrlSmRn9ZPdUrBhJZMpqvD3tSdIU+6OOYjqsPwtTt5PlGyZo+YNL7qXnIy SGY4RB7uGi3AHgZH8AILcPBWzAaFiVTv+LLKeSwUeHfNGuDYmhaUVIDU5tgKNp5HMoihtf g2VWpQ+2MEAxZfx7d34fq/TUHMPAakLPHig8+gLwYUUhEe1QnbRCfqZIv7VZHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxnnd0Tbtzj8y for ; Thu, 22 Jan 2026 17:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a99d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 17:17:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 92d251472edb - main - syslogd/tests: Improve loopback interface initialization List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 92d251472edba6c1c16a899797982251c585d706 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 17:17:57 +0000 Message-Id: <69725bc5.3a99d.505b8c3f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=92d251472edba6c1c16a899797982251c585d706 commit 92d251472edba6c1c16a899797982251c585d706 Author: Mark Johnston AuthorDate: 2026-01-22 15:51:42 +0000 Commit: Mark Johnston CommitDate: 2026-01-22 15:51:42 +0000 syslogd/tests: Improve loopback interface initialization - In syslogd_start(), assign the lo0 address in the specified jail. - Use the correct netmask. Reviewed by: jlduran MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54799 --- usr.sbin/syslogd/tests/syslogd_test.sh | 4 ---- usr.sbin/syslogd/tests/syslogd_test_common.sh | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index d43473eac12d..d4723b9e05b3 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -380,10 +380,8 @@ allowed_peer_test_setup() atf_check ifconfig ${epair}a vnet syslogd_allowed_peer atf_check ifconfig ${epair}b vnet syslogd_client atf_check jexec syslogd_allowed_peer ifconfig ${epair}a inet 169.254.0.1/16 - atf_check jexec syslogd_allowed_peer ifconfig lo0 inet 127.0.0.1/8 atf_check jexec syslogd_client ifconfig ${epair}b inet 169.254.0.2/16 atf_check jexec syslogd_client ifconfig ${epair}b alias 169.254.0.3/16 - atf_check jexec syslogd_client ifconfig lo0 inet 127.0.0.1/8 } allowed_peer_test_cleanup() @@ -529,12 +527,10 @@ forward_body() atf_check ifconfig ${epair}a vnet syslogd_server atf_check jexec syslogd_server ifconfig ${epair}a inet 169.254.0.1/16 atf_check jexec syslogd_server ifconfig ${epair}a alias 169.254.0.2/16 - atf_check jexec syslogd_server ifconfig lo0 inet 127.0.0.1/8 syslogd_mkjail syslogd_client vnet atf_check ifconfig ${epair}b vnet syslogd_client atf_check jexec syslogd_client ifconfig ${epair}b inet 169.254.0.3/16 - atf_check jexec syslogd_client ifconfig lo0 inet 127.0.0.1/8 cat <<__EOF__ > ./client_config user.debug @169.254.0.1 diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index a4aea07f8528..2f21137cf026 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -23,9 +23,6 @@ syslogd_start() local jail bind_arg conf_file pid_file socket privsocket local opt next other_args - # Setup loopback so we can deliver messages to ourself. - atf_check ifconfig lo0 inet 127.0.0.1/16 - OPTIND=1 while getopts ":b:f:j:P:p:S:" opt; do case "${opt}" in @@ -71,6 +68,11 @@ syslogd_start() esac done + # Setup loopback so we can deliver messages to ourself. + if [ $($jail sysctl -n security.jail.vnet) -ne 0 ]; then + atf_check $jail ifconfig lo0 inet 127.0.0.1/8 + fi + $jail syslogd \ ${bind_arg:--b :${SYSLOGD_UDP_PORT}} \ -C \