From owner-svn-src-stable@freebsd.org  Tue Nov 28 19:09:06 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 987D3DEBA7F;
 Tue, 28 Nov 2017 19:09:06 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 648EC73E09;
 Tue, 28 Nov 2017 19:09:06 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vASJ95cI030151;
 Tue, 28 Nov 2017 19:09:05 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vASJ952a030150;
 Tue, 28 Nov 2017 19:09:05 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201711281909.vASJ952a030150@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 28 Nov 2017 19:09:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r326337 - stable/11/usr.sbin/syslogd
X-SVN-Group: stable-11
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: stable/11/usr.sbin/syslogd
X-SVN-Commit-Revision: 326337
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Nov 2017 19:09:06 -0000

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++) {