Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow more then one --conf-file on the command line.

Browse Source
This commit is contained in:
Simon Kelley
2019-03-29 23:11:05 +00:00
parent 5fc639cf9a
commit 5c464ef62e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
man/dnsmasq.8
View File

@@ -1942,8 +1942,9 @@ cannot be lower than 1025 unless dnsmasq is running as root. The number
of concurrent TFTP connections is limited by the size of the port range.
.TP
.B \-C, --conf-file=<file>
Specify a different configuration file. The \fB--conf-file\fP option is also allowed in
configuration files, to include multiple configuration files. A
Specify a configuration file. The presence of this option stops dnsmasq from reading the default configuration
file (normally /etc/dnsmasq.conf). Multiple files may be specified by repeating the option
either on the command line or in configuration files. A
filename of "-" causes dnsmasq to read configuration from stdin.
.TP
.B \-7, --conf-dir=<directory>[,<file-extension>......],

9
src/option.c
View File

@@ -5012,9 +5012,14 @@ void read_opts(int argc, char **argv, char *compile_opts)
}
else if (option == 'C')
{
if (conffile)
free(conffile);
if (!conffile)
conffile = opt_string_alloc(arg);
else
{
char *extra = opt_string_alloc(arg);
one_file(extra, 0);
free(extra);
}
}
else
{