disable filterwin2k in dnsmasq (see #2566)

[openwrt-10.03/.git] / package / dnsmasq / files / dnsmasq.conf

diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 4ef96803a6c74c6138cff13d93d25a02333f6f6e..c0a1958d71b869f838980d79c50fc148bab39281 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/package/dnsmasq/files/dnsmasq.conf
@@ -1,23 +1,21 @@
 # filter what we send upstream
 domain-needed
 bogus-priv
-filterwin2k
+# filterwin2k                  # enable for dial-on-demand
 localise-queries
 
 # allow /etc/hosts and dhcp lookups via *.lan
 local=/lan/
 domain=lan
+expand-hosts
+no-negcache
+resolv-file=/tmp/resolv.conf.auto
 
-# no dhcp / dns queries from the wan
-except-interface=vlan1
-
-# enable dhcp (start,end,netmask,leasetime)
 dhcp-authoritative
-#dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h
-#dhcp-leasefile=/tmp/dhcp.leases
+dhcp-leasefile=/tmp/dhcp.leases
 
 # use /etc/ethers for static hosts; same format as --dhcp-host
-# <hwaddr> [<hostname>] <ipaddr>
+# <hwaddr> <ipaddr>
 read-ethers
 
 # other useful options: