From nobody Fri Jul 7 05:22:02 2023 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 4Qy1wp4Pc9z4mHbV; Fri, 7 Jul 2023 05:22:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qy1wp3zbgz4KTF; Fri, 7 Jul 2023 05:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688707322; 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=GINGcw7PrHsy0c+cT4q0KmtP2rvChNYHQtltwAWQNTo=; b=KESSF0diLNcdJOGtqQlVRkTc72kzM0rz4cCiG3bNTl65JMfqv7AGT2zom3oe9bFYkITS/t X4H6lgOJKlqeRL9jPUt+Rb5grOn2gNfuqif422J1B+DlrAHfijRjH4A9kXi7EYHqCujLja 7OWy1Sm5UAJDeFIS+vbBsB3cFsZRaqWgoXaJmEsigeuA2oKzDsDW2hQGiuLWRpcBbRJv5g c2gpv93U2LSJTTAo+3tgkxjeCunNideCmHshTHeanYnBukIAX5yddoj8GAJWdOuiCzeA2d HOiRrHeS+a2mle8/oFkDOVY7RZaKsbAXit0N/YQGgQo11Lap1YhDcKZjF/Ue1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688707322; 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=GINGcw7PrHsy0c+cT4q0KmtP2rvChNYHQtltwAWQNTo=; b=c64VZNqrZ6LWOmUq8T7OWoxzVMnh/XEtrlKJO+s+0t6X2jZnpVUqKSh720ix4ngpHtPGR4 qHC1A4Ts+MoQnJgAFN2ytdgnS4UgqNuUGPgiku10jZ3sce2v98vI2U9QUN/wGdRSOnieEi vE6H66y0BYu0TWMQJvYbq+gGrFca05dJedpu9b47otUCWfB8xE/c+TLn5nAca1kqh2kvfE qx24CpMVONzCC7jRHxarZjBNJ7Q8xF2GwCziWDmf/Nms+ydjq1MXMEU+LtDwr6F60zD236 QiFeW4M0mYk7F8/dTOUnYsm3jncHdGJAeoIlSg0wLqHfiaJROnSGCFLXX0OUQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688707322; a=rsa-sha256; cv=none; b=WdfToeuXPya6SYbJlBsQ5zAkEnNHdr2D1zalkstYuDJeMVbbU8Zn1xLVm8glVL49X7LMbK 2XL6QTlA/AUWW94xuArdcebSpo99Q1NLtTSb+V3++sZAQKm28Ap4epbUm14qgOmq3jWJKT r/5vcpmHw5E/cpOUw/uUUsvM7ahRNLrpBQvIyFk7wl1mgmok96KVWeIvg/Ii4Rnvwb5iLS Bvsnt2+hoiFj+R4ZLzsn8DzWNdDIQswCgDK3NZVZKoVfdYyID79BsehDmiNCsMTYJWwuwD Emw5z6zMKwUVsBUSFYX6x2YykeNjbSLmgZHKooA5sZUjBMt55HPhG+1Af1Ol7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qy1wp32H9zRMj; Fri, 7 Jul 2023 05:22:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3675M26L072715; Fri, 7 Jul 2023 05:22:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3675M2ul072714; Fri, 7 Jul 2023 05:22:02 GMT (envelope-from git) Date: Fri, 7 Jul 2023 05:22:02 GMT Message-Id: <202307070522.3675M2ul072714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a81b559dad5b - main - Fix saving STRUCTURED-DATA in RFC 5424 log format 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a81b559dad5b75548d1ea847db24147a4410ed92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a81b559dad5b75548d1ea847db24147a4410ed92 commit a81b559dad5b75548d1ea847db24147a4410ed92 Author: Vadim Goncharov AuthorDate: 2023-07-07 05:15:06 +0000 Commit: Warner Losh CommitDate: 2023-07-07 05:15:10 +0000 Fix saving STRUCTURED-DATA in RFC 5424 log format When saving log files in RFC 5424 format presence of STRUCTURED-DATA in message caused line to not appear in log file at all, because a variable forgotten to initialize. This could be tested by (slightly modified) example from RFC: echo '<165>1 2003-10-11T22:14:15.003Z mymachine.example.com su 12345 ID47 [exampleSDID@32473 iut="3" eventSource="Application" eventID="1011"][id@2 test="tast"] BOM"su root" failed for lonvick on /dev/pts/8" ' | nc -w1 -Uu /var/run/log While here, update stale information in comment to logmsg() that RFC 5424 log format was not supported. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/717 --- usr.sbin/syslogd/syslogd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 4600c807a7df..730575c24156 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1123,6 +1123,7 @@ parsemsg_rfc5424(const char *from, int pri, char *msg) FAIL_IF("STRUCTURED-NAME", start == msg); \ } while (0) IF_NOT_NILVALUE(structured_data) { + structured_data = msg; /* SD-ELEMENT. */ while (*msg == '[') { ++msg; @@ -1582,9 +1583,8 @@ evaluate_prop_filter(const struct prop_filter *filter, const char *value) /* * Logs a message to the appropriate log files, users, etc. based on the - * priority. Log messages are always formatted according to RFC 3164, - * even if they were in RFC 5424 format originally, The MSGID and - * STRUCTURED-DATA fields are thus discarded for the time being. + * priority. Log messages are formatted according to RFC 3164 or + * RFC 5424 in subsequent fprintlog_*() functions. */ static void logmsg(int pri, const struct logtime *timestamp, const char *hostname,