aboutsummaryrefslogtreecommitdiffstats
path: root/main/dnsmasq/uncomment-conf-dir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/dnsmasq/uncomment-conf-dir.patch')
-rw-r--r--main/dnsmasq/uncomment-conf-dir.patch5
1 files changed, 4 insertions, 1 deletions
diff --git a/main/dnsmasq/uncomment-conf-dir.patch b/main/dnsmasq/uncomment-conf-dir.patch
index 612a004732..9b64427db2 100644
--- a/main/dnsmasq/uncomment-conf-dir.patch
+++ b/main/dnsmasq/uncomment-conf-dir.patch
@@ -1,8 +1,11 @@
--- a/dnsmasq.conf.example 2016-08-02 11:30:24.207034952 +0200
+++ b/dnsmasq.conf.example 2016-08-02 11:30:34.094695721 +0200
-@@ -663,4 +663,4 @@
+@@ -671,7 +671,7 @@
#conf-dir=/etc/dnsmasq.d,.bak
# Include all files in a directory which end in .conf
-#conf-dir=/etc/dnsmasq.d/,*.conf
+conf-dir=/etc/dnsmasq.d/,*.conf
+
+ # If a DHCP client claims that its name is "wpad", ignore that.
+ # This fixes a security hole. see CERT Vulnerability VU#598349