svn commit: r336058 - stable/11/usr.sbin/syslogd

[Ed Schouten]

Author: ed
Date: Sat Jul  7 11:38:44 2018
New Revision: 336058
URL: https://svnweb.freebsd.org/changeset/base/336058

Log:
  MFC r335861:
  
    Restore the order in which RFC 3164 messages with fac/pri are formatted.
  
    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

Modified:
  stable/11/usr.sbin/syslogd/syslogd.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/11/usr.sbin/syslogd/syslogd.c	Sat Jul  7 11:18:26 2018	(r336057)
+++ stable/11/usr.sbin/syslogd/syslogd.c	Sat Jul  7 11:38:44 2018	(r336058)
@@ -1871,8 +1871,6 @@ fprintlog_rfc3164(struct filed *f, const char *hostnam
 		/* Message written to files. */
 		iovlist_append(&il, timebuf);
 		iovlist_append(&il, " ");
-		iovlist_append(&il, hostname);
-		iovlist_append(&il, " ");
 
 		if (LogFacPri) {
 			iovlist_append(&il, "<");
@@ -1916,6 +1914,9 @@ fprintlog_rfc3164(struct filed *f, const char *hostnam
 
 			iovlist_append(&il, "> ");
 		}
+
+		iovlist_append(&il, hostname);
+		iovlist_append(&il, " ");
 		break;
 	}