From 3d3f71acec5c59a8e01a4d1b0897183fbc49f57c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 21 Apr 2016 19:06:46 +0200 Subject: [PATCH] dns: avoid using global "/etc/dnsmasq.conf" config for dnsmasq 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: 497a8aa5c6463404200a3fcc745aa65396dc4f22 --- src/dns-manager/nm-dns-dnsmasq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 77ac548d8c..4cee160890 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -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;