import of dnsmasq-2.16.tar.gz
diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example
index 7fdd24a..d82159e 100644
--- a/dnsmasq.conf.example
+++ b/dnsmasq.conf.example
@@ -237,7 +237,10 @@
#dhcp-option=45,0.0.0.0 # netbios datagram distribution server
#dhcp-option=46,8 # netbios node type
#dhcp-option=47 # empty netbios scope.
-
+
+# Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client
+# probably doesn't support this......
+#dhcp-option=119,eng.apple.com,marketing.apple.com
# Set the boot filename and tftpd server name and address
# for BOOTP. You will only need this is you want to
@@ -252,6 +255,16 @@
# the line below.
#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
+# Set the DHCP server to authoritative mode. In this mode it will barge in
+# and take over the lease for any client which broadcasts on the network,
+# whether it has a record of the lease or not. This avoids long timeouts
+# when a machine wakes up on a new network. DO NOT enable this if there's
+# the slighest chance that you might end up accidentally configuring a DHCP
+# server for your campus/company accidentally. The ISC server uses the same
+# the same option, and this URL provides more information:
+# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php
+#dhcp-authoritative
+
# Set the cachesize here.
#cache-size=150