From nobody Tue Mar 24 10:59:06 2026 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 4fg6VM0rS2z6WWLm for ; Tue, 24 Mar 2026 10:59:07 +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 4fg6VM02rNz45l2 for ; Tue, 24 Mar 2026 10:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774349947; 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=TBFlNfnjEIEXgeuSI5PNrn00aCdcC9Ok2uCjLOT6w2wDpMuB7CWuhcGWN1e6Pd/eomOqt5 Yv68Krm2LsbToWS3bdvp0L8cpqeWjF8W7MQ88c5pLC3cure2hVGCX8gRZ6c0+MVBmMsAqn MOkOk21UGAtAJb3j0TLCw7ldE+R7DR0J5IoGcMJgMYnwKYmgagxWNPmbzigskcSq8BuHRo 6FbewKzi22CTNBWoVRfWfej5vW5QVyYkiZpIIpK3dXBo1LL9+FGhz+VmfiryeqllB5Y2C6 ecn5uQYT1TZbCAYbLxJ7FQ5JGVg6UXxedi8Vt8O5TEYK/0ZycCs8U6p5X1E/4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774349947; a=rsa-sha256; cv=none; b=RkhhqGcqedxC+OkFhlO8TxuS5vw6ayzKqMtzaD3Jm0Bm+EhNhDLIxdA4kBs0WYhpyaoStB OAYhLcQVTdfuCPQtNhz8NBCd1lyyxYoytz8X5lkpnKxd3VmNmRJ5feaj3U69dL5oUvRGtX eUiCjARe1hwoCtMPh6MG4o5EizZHPJiLuBiVmnw7Eu//il/yKn6uLqEI2MqUulh07ifD7Z yl8gUiX7FzwE4zvONzzw+TgCBVfN94cuPYyipsdH0u1s/KaNylDncaj4kiTzFtpu/AcZNs r6OIV21kbfpXz5GdBEjI5QeUzODUe4qMxJC1tyj+nWul/JaQEPoctBYwn6oedg== 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=1774349947; 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=eQCPI7b1cFTadXRDQn8oUyS2qd9wLk+yE4+sqgWfC/q90AkYy4IcWj0oNBr8QbDkUVywo7 7H9bqwAcchIu8zFBfWM0Wyyv4flR5u4Fv7BzTKr3pHw0w5bpAwle+uaCMLlTlg/Zwh4OWj 7DNkfIWbVniTvrd2fX6eRyuYPUY8Ql/VVVB9rQ1XKIuCw+UzKpgETVeTfZTy64jDYisVfj n8J5UCZd4W98oEmJdmSD1AuoyGMDELjUTEpPzTFJZTCPk7csMPc9+hHQBVlsOkKU6JZD75 MRcOyOYK8w8dzsn5P+M4S3vyxXMtxtLg6XePulICoRcow4zQyRMGHpWUeRhifg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fg6VL6Vn2z1Fs for ; Tue, 24 Mar 2026 10:59:06 +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 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: 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; }