mirror of
https://github.com/pi-hole/dnsmasq.git
synced 2025-12-19 18:28:25 +00:00
--conf-file should read no file, not try and read the default file.
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
version 2.74
|
||||
Fix reversion in 2.73 where --conf-file would attempt to
|
||||
read the default file, rather than no file.
|
||||
|
||||
|
||||
version 2.73
|
||||
Fix crash at startup when an empty suffix is supplied to
|
||||
--conf-dir, also trivial memory leak. Thanks to
|
||||
|
||||
@@ -4371,7 +4371,7 @@ void read_opts(int argc, char **argv, char *compile_opts)
|
||||
{
|
||||
char *buff = opt_malloc(MAXDNAME);
|
||||
int option, conffile_opt = '7', testmode = 0;
|
||||
char *arg, *conffile = NULL;
|
||||
char *arg, *conffile = CONFFILE;
|
||||
|
||||
opterr = 0;
|
||||
|
||||
@@ -4488,11 +4488,8 @@ void read_opts(int argc, char **argv, char *compile_opts)
|
||||
if (conffile)
|
||||
{
|
||||
one_file(conffile, conffile_opt);
|
||||
free(conffile);
|
||||
}
|
||||
else
|
||||
{
|
||||
one_file(CONFFILE, conffile_opt);
|
||||
if (conffile_opt == 0)
|
||||
free(conffile);
|
||||
}
|
||||
|
||||
/* port might not be known when the address is parsed - fill in here */
|
||||
|
||||
Reference in New Issue
Block a user