rsyslog/rsyslog-8.2102.0-rhbz2129015-journal-COMM.patch
alakatos d6b54a3912 Fix wrong type conversion in cstrLen()
resolves: rhbz#2157805
imjournal: by default retrieves _PID from journal as PID number
  resolves: rhbz#2176397
Systemd service file hardening
  resolves: rhbz#2176403
rsyslog.conf: load imuxsock and imjournal before loading rsyslog.d
  resolves: rhbz#2165899
rsyslog is now started after the network service during boot
  resolves: rhbz#2074318
imjournal: add second fallback to the message identifier
  resolves: rhbv#2129015
2023-05-19 11:31:37 +02:00

13 lines
717 B
Diff

diff -up rsyslog-8.2102.0/plugins/imjournal/imjournal.c.orig rsyslog-8.2102.0/plugins/imjournal/imjournal.c
--- rsyslog-8.2102.0/plugins/imjournal/imjournal.c.orig 2023-05-19 10:32:32.467826852 +0200
+++ rsyslog-8.2102.0/plugins/imjournal/imjournal.c 2023-05-19 10:33:34.426902983 +0200
@@ -452,6 +452,8 @@ readjournal(void)
/* Get message identifier, client pid and add ':' */
if (journalGetData("SYSLOG_IDENTIFIER", &get, &length) >= 0) {
CHKiRet(sanitizeValue(((const char *)get) + 18, length - 18, &sys_iden));
+ } else if (journalGetData("_COMM", &get, &length) >= 0) {
+ CHKiRet(sanitizeValue(((const char *)get) + 6, length - 6, &sys_iden));
} else {
CHKmalloc(sys_iden = strdup(cs.dfltTag));
}