From nobody Thu Apr 2 09:56:52 2026 X-Original-To: dev-commits-src-branches@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 4fmchP16CRz6Y7jQ for ; Thu, 02 Apr 2026 09:56:53 +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 4fmchN56lJz45RC for ; Thu, 02 Apr 2026 09:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775123812; 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=5qrgFGAQogPUZy9EouOWO6v9U/pIuyefTGoGLRqtpq4=; b=Re22beY5SXRoRHab2/02JowKlSflPXKLckn5KBLAacPXEy3hFOyU2UwuwrrkSEUjhLx/vJ 3VG1Za2OfeSgkhVXeGh9aMWDb6J9EXyux1/c6j3eroaBFHV6rCCOzBZgA0sObbqPNcKvJd GbhVQ713OFV65eHL0GcuaFaDc7P74BU8m67Pv8C+jmrHWjD//nM6aWueeJyHEYVuqXw1vI WvEzcYJ641LqEwMcywDB8SHrqnjxz2RKOgNH42+5i+MCp27iHNJyY+Sa4JSq2wLpZZRKnX QQ1TbLxAQeosRjphsefJ8RRbRYSK4j+UJ01jAFQH/E6bXrWU2n/22O8Yu5FUaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775123812; a=rsa-sha256; cv=none; b=HsrUyengihxfCrQzC9uBxDbUy1zzcuhjfPi8pa8RC9SPzy4Qy2zTJw5UomFUNqkbFu/peB u0sW9SLz1Erb2fjXmL7Dbo/UIRSQMpUFuxGNMMGiYmzh7samBQRKJqHTfTB0VfXm5STJLk jj3oE04ojW/8w710thQ7MWomEUEFZWL0SlWP4LX2AX+4DaVjb71iPvSn1tFwQ7kqn5AS8b Q/wcapBG0pzNpz25IqjJlLeHAh0iLWRA7lV9Wx5pPkuc37AbPbXRQ456d1so94EOTDxIZp oD1Eu2MeejQTINpLH13dgLezfDNAB5fyil6cf3WXpDh253Y63mFN9hOtO2ETOQ== 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=1775123812; 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=5qrgFGAQogPUZy9EouOWO6v9U/pIuyefTGoGLRqtpq4=; b=GZxf5Dhc0g7xSLLop1v92tJtQS/ViZkQPm6UPpmxdSvQsIRvdoHvejOtzG7IC+gNE/9fRw tzmQ2lsWNSJbhCtssDa0/R1+ee6P/fZ/7UJ7K7RHjRc+VepHzLp8FxUqIbVELVOG7s1z53 Dxfv2qV/0vYN6jsQwQADjq+nNDMbe7Jm5+m3WL9eMfbuVtYACiBS3FHsI+4riRNwlwGsbA Z6xnuPgak6U9MCDxt+UVbeVF3o1ve23MjE4E0bjt8p8mOZz93EJ5NZFovcNm2nmt07tsDt WlWVm7wbnWnWFAi8sVyIwjbx0ry2gipoRrtXwfVjl5HYVYvbAe3yLkL7uYWWpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmchN4TlrzwwN for ; Thu, 02 Apr 2026 09:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bdb5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 02 Apr 2026 09:56:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 25b35dc82b46 - stable/15 - syslogd: Allow killing when in foreground List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 25b35dc82b467efada14ff2892d4460f0b3716f0 Auto-Submitted: auto-generated Date: Thu, 02 Apr 2026 09:56:52 +0000 Message-Id: <69ce3d64.3bdb5.50de29ad@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=25b35dc82b467efada14ff2892d4460f0b3716f0 commit 25b35dc82b467efada14ff2892d4460f0b3716f0 Author: Dag-Erling Smørgrav AuthorDate: 2026-03-24 10:58:53 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-02 09:51:00 +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 (cherry picked from commit 828de702ada854b5f09f447ba06e4e08e976ba07) --- 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 20051bb4fa00..ee15fa70807d 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; }