Treat i686 as an i386 if present, fixes build errors with wireless-tools on i686...

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

diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf
index 8a8191b635138b1e69a4b7c14a0c571071f996e3..c0a1958d71b869f838980d79c50fc148bab39281 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.conf
+++ b/package/dnsmasq/files/dnsmasq.conf
@@ -1,23 +1,18 @@
 # 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
 
-@ifdef dhcp_enable
-dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@
 dhcp-authoritative
 dhcp-leasefile=/tmp/dhcp.leases
-@endif
-@ifdef wan_ifname
-except-interface=@@wan_ifname@@
-@endif
 
 # use /etc/ethers for static hosts; same format as --dhcp-host
 # <hwaddr> <ipaddr>