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

--conf-file should read no file, not try and read the default file.

Browse Source
This commit is contained in:
Simon Kelley
2015-07-05 21:59:10 +01:00
parent 850163288d
commit 90cb222551
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -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 version 2.73
Fix crash at startup when an empty suffix is supplied to Fix crash at startup when an empty suffix is supplied to
--conf-dir, also trivial memory leak. Thanks to --conf-dir, also trivial memory leak. Thanks to

9
src/option.c
View File

@@ -4371,7 +4371,7 @@ void read_opts(int argc, char **argv, char *compile_opts)
{ {
char *buff = opt_malloc(MAXDNAME); char *buff = opt_malloc(MAXDNAME);
int option, conffile_opt = '7', testmode = 0; int option, conffile_opt = '7', testmode = 0;
char *arg, *conffile = NULL; char *arg, *conffile = CONFFILE;
opterr = 0; opterr = 0;
@@ -4488,11 +4488,8 @@ void read_opts(int argc, char **argv, char *compile_opts)
if (conffile) if (conffile)
{ {
one_file(conffile, conffile_opt); one_file(conffile, conffile_opt);
free(conffile); if (conffile_opt == 0)
} free(conffile);
else
{
one_file(CONFFILE, conffile_opt);
} }
/* port might not be known when the address is parsed - fill in here */ /* port might not be known when the address is parsed - fill in here */