From owner-svn-src-stable-11@freebsd.org  Fri Dec 29 16:48:15 2017
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 804EDEA529D;
 Fri, 29 Dec 2017 16:48:15 +0000 (UTC)
 (envelope-from roberto@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 4A43B71593;
 Fri, 29 Dec 2017 16:48:15 +0000 (UTC)
 (envelope-from roberto@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBTGmE7f011672;
 Fri, 29 Dec 2017 16:48:14 GMT (envelope-from roberto@FreeBSD.org)
Received: (from roberto@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBTGmEkD011671;
 Fri, 29 Dec 2017 16:48:14 GMT (envelope-from roberto@FreeBSD.org)
Message-Id: <201712291648.vBTGmEkD011671@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: roberto set sender to
 roberto@FreeBSD.org using -f
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Fri, 29 Dec 2017 16:48:14 +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: r327348 - stable/11/usr.sbin/syslogd
X-SVN-Group: stable-11
X-SVN-Commit-Author: roberto
X-SVN-Commit-Paths: stable/11/usr.sbin/syslogd
X-SVN-Commit-Revision: 327348
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-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Dec 2017 16:48:15 -0000

Author: roberto
Date: Fri Dec 29 16:48:14 2017
New Revision: 327348
URL: https://svnweb.freebsd.org/changeset/base/327348

Log:
  In stable/11, support for including config. files is broken and only the
  last one is taken into account.
  
  Code in 12-CURRENT s different and works so commit is in stable/11.
  
  Patch by Alexander Zagrebin <alex@zagrebin.ru> in the PR.
  
  PR:		220884
  Relnotes:	yes
  Submitted by:	Dan McGregor <dan.mcgregor@usask.ca>

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

Modified: stable/11/usr.sbin/syslogd/syslogd.c
==============================================================================
--- stable/11/usr.sbin/syslogd/syslogd.c	Fri Dec 29 16:13:06 2017	(r327347)
+++ stable/11/usr.sbin/syslogd/syslogd.c	Fri Dec 29 16:48:14 2017	(r327348)
@@ -1632,7 +1632,7 @@ configfiles(const struct dirent *dp)
 	return (1);
 }
 
-static void
+static struct filed **
 readconfigfile(FILE *cf, struct filed **nextp, int allow_includes)
 {
 	FILE *cf2;
@@ -1693,7 +1693,7 @@ readconfigfile(FILE *cf, struct filed **nextp, int all
 				if (cf2 == NULL)
 					continue;
 				dprintf("reading %s\n", file);
-				readconfigfile(cf2, nextp, 0);
+				nextp = readconfigfile(cf2, nextp, 0);
 				fclose(cf2);
 			}
 			free(ent);
@@ -1760,6 +1760,7 @@ readconfigfile(FILE *cf, struct filed **nextp, int all
 		nextp = &f->f_next;
 		cfline(cline, f, prog, host);
 	}
+	return nextp;
 }
 
 /*