From nobody Tue Mar 24 10:59:06 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 4fg6VS2kwTz6WWJv for ; Tue, 24 Mar 2026 10:59:12 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fg6VS24J4z45tK for ; Tue, 24 Mar 2026 10:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774349952; 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=d2trl2+mOxcKDu+Z4393LiBzCctBtYZiUPlDTdY4ZlY=; b=ZPv4ayx9Ax1CoIlp6l3iUDlZvyG/FjXJwsdU1RdN5G8wcS4I+igkPJi13dpgRBoSStEcGB ul5lyaIwq1rYEvzRUrpT4/Fej58/LWYq6dbc1dbGVhPmHbq+od/TzIdOt5vLu75mCDFMo4 FiIlCZZNVgaban0X+FnxQL8FX3pqEC8qIBD6XqA1jEomcqIcW2xWSyEHzsHbTgMu4ql77Q hlUY/9Ra649KviEuvYJzZ9PxB1U5BLBQGXC+5GleLjpywXiaYvSUCN3QErhC2opoz26d6b 6hy247t8dYpcUle9Lf2sY15nds7x8PGgu6j+Qw7ov9uXI4bRsRo3rWGtCj+xkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774349952; a=rsa-sha256; cv=none; b=CzocYgi6IR2PGbmIlqTLeskoxCUFCMKEfnlr69sRjm41C9ePyb8M8InfTFjkxTrRnqtENr NFe1V4k9wVSHdmyF5+WncIMYVzaxJjzqlDMys3tH4xL8rQyI4uEbKM6nRnnY44rLR3gZ3t +6us9Dlpt8/6IoWw2Jk5PIOTkVkU0sMrG1w50Dn5KR0jSo8VWeiGxy3XWoONSasE10qYfV ZNWh+/qI7P67xsfIRSdVJ6gun4eIJoS35+aP+CUVRzKXJNlp9yQfYhI8odjPVgcLOt8XLQ rRvm3eUpFsgBc7wuu5OkG8UA+zgWaE8oFRmiiKdeEeq04czRPzLIhR0X0KHxHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774349952; 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=d2trl2+mOxcKDu+Z4393LiBzCctBtYZiUPlDTdY4ZlY=; b=YKep7iAbSRDegB422nNWFjfX/Oo6MAC5Gentb6jZZA3CNCMIRacvbLclJ41lhKCbOUXx6h 2fRzPHmLqnq6wav0M8eDUmHVIFAYV1LHD8ODNx/HgM9H09B2Q3SY/Vs3fOGdlM8OWNo52l Tws9R5RwKg956tmzbZk+ymrD6S7Qoe3+44sZZoVWk3lnVSwjbB02vdwEaukXSVHnQG9LxE xnGKHpnzryys6KWxVqmxMtRDzROG71gNYN+YrCEghd9MxX24qq/2mHvqsI91bNFQZ0THNa SXmZtCePqlytAuW01ruljkmT/hLOJhBCYu2WaGlZC4Iz7JCGTv8dOW6GcQq7JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg6VS1b3qz1Ft for ; Tue, 24 Mar 2026 10:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36617 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 10:59:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 828de702ada8 - main - syslogd: Allow killing when in foreground 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 828de702ada854b5f09f447ba06e4e08e976ba07 Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 10:59:06 +0000 Message-Id: <69c26e7a.36617.4648dbbe@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=828de702ada854b5f09f447ba06e4e08e976ba07 commit 828de702ada854b5f09f447ba06e4e08e976ba07 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-24 10:58:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-24 10:58:53 +0000 syslogd: Allow killing when in foreground Normally, syslogd reacts only to SIGTERM, and ignores SIGINT and SIGQUIT unless in debug mode. Extend that to also apply when running in the foreground. Take this opportunity to comment the event loop. MFC after: 1 week Reviewed by: jfree Differential Revision: https://reviews.freebsd.org/D55886 --- usr.sbin/syslogd/syslogd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 1b894ae54fc6..dcc74b1a93c1 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -781,15 +781,21 @@ main(int argc, char *argv[]) case EVFILT_SIGNAL: switch (ev.ident) { case SIGHUP: + /* Reload */ init(true); break; case SIGINT: case SIGQUIT: + /* Ignore these unless -F and / or -d */ + if (!Foreground && !Debug) + break; + /* FALLTHROUGH */ case SIGTERM: - if (ev.ident == SIGTERM || Debug) - die(ev.ident); + /* Terminate */ + die(ev.ident); break; case SIGALRM: + /* Mark and flush */ markit(); break; }