On Sun, 2015-06-28 at 18:27 +0200, Michael Biebl wrote: > If the current usage of --conf-file with an empty parameter was not > officially supported and only working by accident, then this is indeed > something which needs adjustments in NM, otherwise this bug report > should be re-assigned to dnsmasq.
Looking at the dnsmasq code, the read_opts function has changed:
Before:
conffile set to /etc/dnsmasq.conf by default
-C option sets conffile to NULL
conffile is NULL, conffile reading skipped
After:
conffile set to NULL by default
-C option sets conffile to NULL
conffile is NULL, /etc/dnsmasq.conf read instead
diff:
diff -Nru dnsmasq-2.72/src/option.c dnsmasq-2.73/src/option.c
--- dnsmasq-2.72/src/option.c 2014-09-24 19:35:05.000000000 +0800
+++ dnsmasq-2.73/src/option.c 2015-06-15 04:13:04.000000000 +0800
@@ -4271,9 +4370,9 @@
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 = CONFFILE;
+ char *arg, *conffile = NULL;
opterr = 0;
daemon = opt_malloc(sizeof(struct daemon));
@@ -4386,24 +4485,35 @@
}
}
if (conffile)
- one_file(conffile, conffile_opt);
+ {
+ one_file(conffile, conffile_opt);
+ free(conffile);
+ }
+ else
+ {
+ one_file(CONFFILE, conffile_opt);
+ }
/* port might not be known when the address is parsed - fill in here */
if (daemon->servers)
{
--
bye,
pabs
https://wiki.debian.org/PaulWise
signature.asc
Description: This is a digitally signed message part
