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

[Gleb Smirnoff]

Author: glebius
Date: Tue Nov 28 19:09:05 2017
New Revision: 326337
URL: https://svnweb.freebsd.org/changeset/base/326337

Log:
  Revert r326103, as it appeared to be incorrect.

Modified:
  stable/11/usr.sbin/syslogd/syslogd.c

Modified: stable/11/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/11/usr.sbin/syslogd/syslogd.c	Tue Nov 28 18:44:58 2017	(r326336)
+++ stable/11/usr.sbin/syslogd/syslogd.c	Tue Nov 28 19:09:05 2017	(r326337)
@@ -972,7 +972,7 @@ static void
 logmsg(int pri, const char *msg, const char *from, int flags)
 {
 	struct filed *f;
-	int i, j, fac, msglen, omask, prilev;
+	int i, fac, msglen, omask, prilev;
 	const char *timestamp;
  	char prog[NAME_MAX+1];
 	char buf[MAXLINE+1];
@@ -1018,19 +1018,6 @@ logmsg(int pri, const char *msg, const char *from, int
 	}
 
 	prilev = LOG_PRI(pri);
-
-	/* skip hostname, see RFC 3164 */
-	for (i = 0, j = 0; i < NAME_MAX; i++) {
-		if (isspace(msg[i])) {
-			j = i + 1;
-		}
-		if (msg[i] == ':')
-			break;
-	}
-	if (j <= msglen) {
-		msg += j;
-		msglen -= j;
-	}
 
 	/* extract program name */
 	for (i = 0; i < NAME_MAX; i++) {