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 <a...@zagrebin.ru> in the PR.
PR: 220884
Relnotes: yes
Submitted by: Dan McGregor <dan.mcgre...@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;
}
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
