d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore the order in which RFC 3164 messages with fac/pri are formatted.

Browse Source 
The refactoring of the syslogd code to format messages using iovecs
slightly altered the output of syslogd by placing the facility/priority
after the hostname, as opposed to printing it right before. This change
reverts the behaviour to be consistent with how it was before.

PR:		229457
Reported by:	Andre Albsmeier
MFC after:	1 week
This commit is contained in:
Ed Schouten 2018-07-02 10:57:22 +00:00
parent 294b242d80
commit 8a66bdb414
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/syslogd/syslogd.c
View File

@ -1873,8 +1873,6 @@ fprintlog_rfc3164(struct filed *f, const char *hostname, const char *app_name,
/* Message written to files. */
iovlist_append(&il, timebuf);
iovlist_append(&il, " ");
iovlist_append(&il, hostname);
iovlist_append(&il, " ");
if (LogFacPri) {
iovlist_append(&il, "<");
@ -1918,6 +1916,9 @@ fprintlog_rfc3164(struct filed *f, const char *hostname, const char *app_name,
iovlist_append(&il, "> ");
}
iovlist_append(&il, hostname);
iovlist_append(&il, " ");
break;
}