Could you merge:
* doc/inetutils.texi: Document new -D and --rcdir syslogd
options.
* paths (PATH_LOGCONFD): New variable.
* syslogd/Makefile.am (AM_CPPFLAGS): Add PATHDEF_LOGCONFD.
* syslogd/syslogd.c: Include <dirent.h>.
(ConfDir): New variable.
(load_confdir): New function declaration.
(argp_options): Add rcdir entry.
(parse_opt): Handle 'D' option.
(load_confdir): New function definition.
(init): Call load_confdir instead of load_conffile.
with
* syslogd/syslogd.c (load_conffile): New function declaration.
(init): Move configuration file loading into ...
(load_conffile): ... here. New function definition.
?
