From nobody Tue Mar 31 15:58:49 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 4flXpx5l3fz6WFDV for ; Tue, 31 Mar 2026 15:58:49 +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 4flXpx3Kj0z3gmy for ; Tue, 31 Mar 2026 15:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972729; 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=8tqhSk+kSNTF/A2R7DfcUtq/iBGn0KMC4EBEuy6464c=; b=BNGysWMt4HUBTUYUGJZzv3PbuB3dfW+c7vCosyC5Av7lMXqEIDGJRQECdctz/2RY5EJ3dO hOC7Uz1HuuVwnvE95tVddeL3mEBfAaSFxy3+izPmllIGkwJJV0nptmrnTEX6tvekQ4Lwxd Kx2DmiMBDLCC1IywIwYV7bf923JotMUTWZfxShVmDTzx/FnpD1uMM6dFb39EyV6fB34M2C 0wuONiCaQrv5cMQrH/2cvleaFHjXNrMMIhM94ePxwBFC7+Sy5lQGwsAYZ9qge6VI0CKvzo bB2bm2fLwXQZuvsuTiDSlMGpfBi294jZGZwwHnWLsF2g/xJw3PtfdESUaTYWcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972729; a=rsa-sha256; cv=none; b=LOGW87L3D+Nc1mr71//Xh/MaDYnqL9LiExZh8Y9v25NSwqZ3l3E/aYplYZLub4FK/cedJw ocnD8k0G5Jh0LuQAnUrSvGVoLtT9QwkBXz8ueYp5pzZtPuweLyawSLF1YwKom+YmWA8Tl0 pkk6CLVb8B834CCNMkllARqP/XmyT0yLviYA62g/5Wmao12ksQWhiP/uPpZ9geHnkaPZ75 oI/NQOEosUbt8z/8h3VPUAhP7qjBIWtJR3ExDmAoW1prjpRRBMksuATj7AzvDCp8HOD7uK /O/roNFh1ccvWM3C7STkoPXCl5KOCNcbgKgaluGG671tNsZFvc8gUBqCjbrHVg== 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=1774972729; 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=8tqhSk+kSNTF/A2R7DfcUtq/iBGn0KMC4EBEuy6464c=; b=m0hZQgca7RyhCAzLp+tgIPynV7bHRyyeAjiBdVut4v/bJUmjUUWmW5gf5eMaS2x5/QM/+Y M1tErk4Egbdaepj1oitk4dUHEL7csZsB8K8j5Xsnks0wvy6T2TFhvs9BFc6kO4xZnlOXJP j2woLrRe7V0bFN1fVPCQAQO4J90uaMM5By/7I8pEWOkpg5snIlVaZlN61cqbd5vn3l3pSA NOSpv2SCuY+cQoNTn6DwWlk4ga3is3HcbWvhbRH8HrLmzYb4dExef4qJNvDUGSpvpOrrYV E5IUbbWpTjAesLfeUSINpt1cGd/C947PVgOigNXTE+4C8JX4voX9QGDtUHbwNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXpx1pSpzcfW for ; Tue, 31 Mar 2026 15:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 395f4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0edafb4cfbbd - stable/15 - syslogd: Improve handling of configuration errors 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0edafb4cfbbd43ae9f5c4758a2872df1794e208e Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:49 +0000 Message-Id: <69cbef39.395f4.78a2da24@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0edafb4cfbbd43ae9f5c4758a2872df1794e208e commit 0edafb4cfbbd43ae9f5c4758a2872df1794e208e Author: Mark Johnston AuthorDate: 2026-02-16 19:50:45 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:28 +0000 syslogd: Improve handling of configuration errors Make parse_selector() print a warning to stderr and continue parsing the config if it encounters an invalid facility or priority. Note that because the parsing is done from a casper service, there isn't a good mechanism to log errors; the warnings are visible only when syslogd is started in debug mode. Reported by: Doug Hardie MFC after: 1 week Fixes: f4b4a10abb26 ("syslogd: Move selector parsing into its own function") Reviewed by: jfree, jlduran, eugen, delphij Differential Revision: https://reviews.freebsd.org/D55033 (cherry picked from commit 29ec3907f193e205a1c2118c182ec43e51baf717) --- usr.sbin/syslogd/syslogd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 972b64ed732e..20051bb4fa00 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -2930,8 +2930,9 @@ parse_selector(const char *p, struct filed *f) pri = decode(buf, prioritynames); if (pri < 0) { - dprintf("unknown priority name \"%s\"", buf); - return (NULL); + warnx("unknown priority name \"%s\", setting to 'info'", + buf); + pri = LOG_INFO; } } if (!pri_cmp) @@ -2953,11 +2954,12 @@ parse_selector(const char *p, struct filed *f) } else { i = decode(buf, facilitynames); if (i < 0) { - dprintf("unknown facility name \"%s\"", buf); - return (NULL); + warnx("unknown facility name \"%s\", ignoring", + buf); + } else { + f->f_pmask[i >> 3] = pri; + f->f_pcmp[i >> 3] = pri_cmp; } - f->f_pmask[i >> 3] = pri; - f->f_pcmp[i >> 3] = pri_cmp; } while (*p == ',' || *p == ' ') p++;