From nobody Mon Feb 16 20:16:37 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 4fFDZF1Vh8z6SHs3 for ; Mon, 16 Feb 2026 20:16:37 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFDZF123Tz40BP for ; Mon, 16 Feb 2026 20:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771272997; 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=Yh7BDk3Hky59/Rs6jsRLFB2W0FyPORv6+WQ+lKs2guM=; b=XOMVf+AlmOi7CZNZpaq82kYMIuQaE2CMACdbRhEJ2blaER59gb1Ou4OJ1nS2R0ZpJYHS0L JWGursllBTFdGNffx6j02NArj4Lv2Ml/h8lqrhGPL9C86+PdtzmzKHWM3c7McHkNJo8d7H 9wxJqMT9VazsGtx/H/JgpWUuOcVmd7hqNeVEprayCyhl075Lvm35yEI9GU2r082s+qhy+e 4mxobE3eNlhokwTsMhg0UMUATXKMzRU6pLsQn/wpnM5dzxSq1oZSlpqsyiFzMEzx49NiCp Tz2/CfuXtXws9sdiE+d1xvrZfseE2xYvzMO9oO9LLXv4N1f4Qc1Uh/0kRiXbwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771272997; a=rsa-sha256; cv=none; b=dHKvwBdDUXnECPTVsrTAkbZ89d5ngHA+HGFIpUZL4cIRRs5y3rwTQxIgV+XIPDuldPmXEG dgWpSh0m5+pLam9S5/BGlh7uai/g3EL+Ojon0nZSpi29dEBcQu9Bh6baJU1hjMtLnpNH0d 8YEz0PzgoBpeK1n7GyfjWnWiWLZB5/Tm0qnt1dokbRkvAuIsuXC1MrW2h8f7LBAm+YlqYD slVwpWEfWHCk645sFeC8AN7OnsCiXg4KaOCtW85FbVIfEjDpA2Y/AlX6sRx0iJRwpg4thX yZWr20yIXkvS3s6fZffqm+NV+d35TqA5tpQj9U4p+FZXzDZ/lor+8oXHwAEm6g== 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=1771272997; 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=Yh7BDk3Hky59/Rs6jsRLFB2W0FyPORv6+WQ+lKs2guM=; b=xVQ9d9ZYmb5fijqFX5cnsryIKFPe3LNH8TQkoI7fZ8mKImuGOF00hIXZzJuQvZgviNCAyP c51zdLtDM7hUqR2N9qaXAi14fKXmSr1zJiuQLvgoc+q98LRikLQDexNuDn7gjpB51xGtMA kTLUm9DpE4N2lc2j6pFPM8B4hlnRXOwN1+aEtHBcBWXGKGVCbgLwSssnkOAS8tKw5VIQ92 hLD/95bPLp0LULFTV/DzKpMUgHV/djylMxyz93eeCjT7FHK6gmZoMOzTjgnFiqqjzJE86E 5e5VCjA+a97L9wOTmUsPNu9P0ySevpfRF0o9QdHAw9h31ci27pzCsdszwWwo1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFDZF0dXxzfXQ for ; Mon, 16 Feb 2026 20:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42646 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 20:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 29ec3907f193 - main - syslogd: Improve handling of configuration errors 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29ec3907f193e205a1c2118c182ec43e51baf717 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 20:16:37 +0000 Message-Id: <69937b25.42646.3f70352e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=29ec3907f193e205a1c2118c182ec43e51baf717 commit 29ec3907f193e205a1c2118c182ec43e51baf717 Author: Mark Johnston AuthorDate: 2026-02-16 19:50:45 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 20:16:12 +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 --- 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 f109fcd02563..1b894ae54fc6 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -2932,8 +2932,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) @@ -2955,11 +2956,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++;