From owner-svn-src-all@freebsd.org  Wed Nov 22 21:20:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 F31CCDF602D;
 Wed, 22 Nov 2017 21:20:27 +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 BF77A6A7B0;
 Wed, 22 Nov 2017 21:20:27 +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 vAMLKQGR003114;
 Wed, 22 Nov 2017 21:20:26 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAMLKQil003113;
 Wed, 22 Nov 2017 21:20:26 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201711222120.vAMLKQil003113@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: Wed, 22 Nov 2017 21:20:26 +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: r326103 - 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: 326103
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Nov 2017 21:20:28 -0000

Author: glebius
Date: Wed Nov 22 21:20:26 2017
New Revision: 326103
URL: https://svnweb.freebsd.org/changeset/base/326103

Log:
  MFC r325558:
  
    When parsing UDP messages skip optional hostname as described by
    RFC 3164.
  
  PR:		200933
  Submitted by:	maxim
  Reported by:	Konstantin Pavlov <thresh nginx.com>

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	Wed Nov 22 20:27:46 2017	(r326102)
+++ stable/11/usr.sbin/syslogd/syslogd.c	Wed Nov 22 21:20:26 2017	(r326103)
@@ -972,7 +972,7 @@ static void
 logmsg(int pri, const char *msg, const char *from, int flags)
 {
 	struct filed *f;
-	int i, fac, msglen, omask, prilev;
+	int i, j, fac, msglen, omask, prilev;
 	const char *timestamp;
  	char prog[NAME_MAX+1];
 	char buf[MAXLINE+1];
@@ -1018,6 +1018,19 @@ 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++) {