system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-01 07:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

dns: avoid using global "/etc/dnsmasq.conf" config for dnsmasq

Browse Source 
Pass an empty configuration file otherwise dnsmasq loads
"/etc/dnsmasq.conf".

We already allow for a config.d/ directory "/etc/NetworkManager/dnsmasq.d"
to allow the user to overwrite configuration. We don't want to consider
the global config file.

Fixes: 497a8aa5c6
This commit is contained in:
Thomas Haller 2016-04-21 19:06:46 +02:00
parent 497a8aa5c6
commit 3d3f71acec
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dns-manager/nm-dns-dnsmasq.c
View File

@ -393,6 +393,7 @@ start_dnsmasq (NMDnsDnsmasq *self)
argv[idx++] = "--pid-file=" PIDFILE;
argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
argv[idx++] = "--cache-size=400";
argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;