Date: Fri, 29 Dec 2017 16:48:14 +0000 (UTC) From: Ollivier Robert <roberto@FreeBSD.org> 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 Message-ID: <201712291648.vBTGmEkD011671@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712291648.vBTGmEkD011671>