2018-03-19 12:20:12 +01:00
|
|
|
diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.example
|
2018-04-10 10:25:58 +02:00
|
|
|
--- dnsmasq-2.79.orig/dnsmasq.conf.example 2018-04-04 12:11:55.871714531 +0200
|
|
|
|
|
+++ dnsmasq-2.79/dnsmasq.conf.example 2018-04-04 12:14:52.416900426 +0200
|
|
|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
|
|
|
|
|
|
# Uncomment these to enable DNSSEC validation and caching:
|
|
|
|
|
# (Requires dnsmasq to be built with DNSSEC option.)
|
|
|
|
|
-#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf
|
|
|
|
|
+#conf-file=/usr/share/dnsmasq/trust-anchors.conf
|
|
|
|
|
#dnssec
|
|
|
|
|
|
|
|
|
|
# Replies which are not DNSSEC signed may be legitimate, because the domain
|
2014-04-12 18:00:02 +02:00
|
|
|
@@ -96,8 +96,8 @@
|
2006-02-23 16:26:10 +01:00
|
|
|
|
|
|
|
|
# If you want dnsmasq to change uid and gid to something other
|
|
|
|
|
# than the default, edit the following lines.
|
|
|
|
|
-#user=
|
|
|
|
|
-#group=
|
2008-07-11 09:23:02 +02:00
|
|
|
+#user=nobody
|
|
|
|
|
+#group=nobody
|
2006-02-23 16:26:10 +01:00
|
|
|
|
|
|
|
|
# If you want dnsmasq to listen for DHCP and DNS requests only on
|
|
|
|
|
# specified interfaces (and the loopback) give the name of the
|
2015-07-29 09:53:10 +02:00
|
|
|
@@ -535,7 +535,7 @@
|
2006-02-23 16:26:10 +01:00
|
|
|
# The DHCP server needs somewhere on disk to keep its lease database.
|
|
|
|
|
# This defaults to a sane location, but if you want to change it, use
|
|
|
|
|
# the line below.
|
|
|
|
|
-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
|
2018-04-10 10:25:58 +02:00
|
|
|
+#dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases
|
2006-02-23 16:26:10 +01:00
|
|
|
|
|
|
|
|
# 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,
|
2018-03-19 12:20:12 +01:00
|
|
|
diff -Nru dnsmasq-2.79.orig/src/config.h dnsmasq-2.79/src/config.h
|
2018-04-10 10:25:58 +02:00
|
|
|
--- dnsmasq-2.79.orig/src/config.h 2018-04-04 12:11:55.868381226 +0200
|
|
|
|
|
+++ dnsmasq-2.79/src/config.h 2018-04-04 12:12:12.708240101 +0200
|
2018-03-19 12:20:12 +01:00
|
|
|
@@ -44,7 +44,7 @@
|
2013-04-19 17:15:15 +02:00
|
|
|
#define ETHERSFILE "/etc/ethers"
|
2012-03-08 13:18:11 +01:00
|
|
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
|
|
|
|
#define CHUSER "nobody"
|
|
|
|
|
-#define CHGRP "dip"
|
|
|
|
|
+#define CHGRP "nobody"
|
|
|
|
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
|
|
|
|
#define LOG_MAX 5 /* log-queue length */
|
|
|
|
|
#define RANDFILE "/dev/urandom"
|
2018-03-19 12:20:12 +01:00
|
|
|
@@ -190,7 +190,7 @@
|
2011-02-19 11:23:03 +01:00
|
|
|
# elif defined(__ANDROID__)
|
|
|
|
|
# define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
|
2009-02-07 09:00:27 +01:00
|
|
|
# else
|
|
|
|
|
-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
|
|
|
|
+# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases"
|
|
|
|
|
# endif
|
2006-02-23 16:26:10 +01:00
|
|
|
#endif
|
2009-02-07 09:00:27 +01:00
|
|
|
|
