From nobody Thu Apr 2 09:56:52 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 4fmchV08jfz6Y7jS for ; Thu, 02 Apr 2026 09:56:58 +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 4fmchT6htTz459Y for ; Thu, 02 Apr 2026 09:56:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775123817; 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=VTqsZ6L6gTfslewVEGsmf5Q3xdNuucVropyTJ4fwuyUs/Egt7n9gryYMX2n8EVbVhT0Hr6 kpI2p38ukDOyfNdQuz4vsskKB6EH9wNeP44UGfH9j1yI9WNplp/HuDpa82hZ5QUYwxAk+z LdSA214gDufalLA94OV1PWyAVlWhNEKUl+sOJM8VYZTL3B8MntZvOdPv73zId+AOOj3k1u fio0LJ76x/U2Vd7y4rVD+l+E8Qe5orfQ0rzBrLNGbYQxufAGdrqazpNGYH7QHcLqmH5rxr 6ZMDgg9WoPS/3uQRj9168L+bckjT9Xf5wjragnohviQWssJNITZ+MPsIFL4Deg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775123817; a=rsa-sha256; cv=none; b=Xg+im/MdwT5R9UmKriYrB0Q7Dom8E94z/MEhFYM6yDu3A+SPLXsH5c7qABfmc8X4kBxhu4 bpyzJPv6o1SYNgnHrTsKpCQpdcjWCqgzRsOEF1IO9Mxefsd4iGQKTh2tD06hSa35o/Y10Q dQb0zBriiH+sk/0BGR/rGMBb8vRUUfI6w6vbOxDNlBUnfDOSsUwzWe6p3UQsQi0jYRlCia 9IsguFi1o82EXcrmyPCER01/gjR88BVtZX7+dFguYcVl/rS8XaLQG2BzagNxTrwz3Z6Cve vxx273H305YAn57dkh4TytrvJ6mk1CeDY0rpFuLnTD/Z71uvq5MElgA5y/Sq3w== 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=1775123817; 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=bpoNCl6SEv01PKpVG/0c80TrdWlFgVr1+3/Hp18vc7mGQKrCwlzRIxljkdUGGZwa0lQLuF LIqqc0a22gAEmNFiBmAimiiRoPO2iUxpXFHEKFhhRNdyRcBBdr9DLYy7RTVcxaAO5hK550 uGbQMuh/0r58rGlBiXlAw9d5UTyNzLt1maiHvAIwT2cSr/RUBgyauP6JyFJOtEJ2g9iBiL M00EWHVB4/cpwUFu6B3kqrBMaFC05vR27fuKUuIZSR9UQKqecCeBtjtZLLrUBmMrT0Wk49 1At/EnJ774BMW7oeLLUzUhp+er7klTg9rBHX46sy4MJBclHTwE9eG76jcNcG1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fmchT5pLXzwwP for ; Thu, 02 Apr 2026 09:56:57 +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: 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/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; }