2022-09-27 10:58:19 +02:00
|
|
|
<<<<<<< HEAD
|
2022-02-16 17:15:59 +01:00
|
|
|
diff -Nru dnsmasq-2.86.orig/dnsmasq.conf.example dnsmasq-2.86/dnsmasq.conf.example
|
|
|
|
|
--- dnsmasq-2.86.orig/dnsmasq.conf.example 2022-02-16 15:33:26.622970564 +0100
|
|
|
|
|
+++ dnsmasq-2.86/dnsmasq.conf.example 2022-02-16 15:34:00.675532744 +0100
|
2022-09-27 10:58:19 +02:00
|
|
|
=======
|
2022-09-26 16:28:25 +02:00
|
|
|
diff -Nru dnsmasq-2.87.orig/dnsmasq.conf.example dnsmasq-2.87/dnsmasq.conf.example
|
|
|
|
|
--- dnsmasq-2.87.orig/dnsmasq.conf.example 2022-09-26 13:02:40.145014750 +0200
|
|
|
|
|
+++ dnsmasq-2.87/dnsmasq.conf.example 2022-09-26 13:02:54.071352953 +0200
|
2022-09-27 10:58:19 +02:00
|
|
|
>>>>>>> 0abfa391af2ddc9a13b1c97b59ec0c1e4bbe4a61
|
2018-04-10 10:25:58 +02:00
|
|
|
@@ -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
|
2022-09-26 16:28:25 +02:00
|
|
|
@@ -106,8 +106,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
|
2022-09-26 16:28:25 +02:00
|
|
|
@@ -545,7 +545,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,
|
2022-09-27 10:58:19 +02:00
|
|
|
<<<<<<< HEAD
|
2022-02-16 17:15:59 +01:00
|
|
|
diff -Nru dnsmasq-2.86.orig/src/config.h dnsmasq-2.86/src/config.h
|
|
|
|
|
--- dnsmasq-2.86.orig/src/config.h 2022-02-16 15:33:26.626303822 +0100
|
|
|
|
|
+++ dnsmasq-2.86/src/config.h 2022-02-16 15:34:45.014534363 +0100
|
2022-09-27 10:58:19 +02:00
|
|
|
=======
|
2022-09-26 16:28:25 +02:00
|
|
|
diff -Nru dnsmasq-2.87.orig/src/config.h dnsmasq-2.87/src/config.h
|
|
|
|
|
--- dnsmasq-2.87.orig/src/config.h 2022-09-26 13:02:40.145014750 +0200
|
|
|
|
|
+++ dnsmasq-2.87/src/config.h 2022-09-26 13:02:54.071352953 +0200
|
2022-09-27 10:58:19 +02:00
|
|
|
>>>>>>> 0abfa391af2ddc9a13b1c97b59ec0c1e4bbe4a61
|
2022-02-16 17:15:59 +01:00
|
|
|
@@ -45,7 +45,7 @@
|
2021-01-27 10:48:06 +01:00
|
|
|
#define DEFLEASE 3600 /* default DHCPv4 lease time, one hour */
|
|
|
|
|
#define DEFLEASE6 (3600*24) /* default lease time for DHCPv6. One day. */
|
2012-03-08 13:18:11 +01:00
|
|
|
#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"
|
2022-09-26 16:28:25 +02:00
|
|
|
@@ -208,7 +208,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
|
|
|
|
2022-02-16 17:15:59 +01:00
|
|
|
@@ -228,7 +228,7 @@
|
|
|
|
|
# if defined(__ANDROID__)
|
|
|
|
|
# define RUNFILE "/data/dnsmasq.pid"
|
|
|
|
|
# else
|
|
|
|
|
-# define RUNFILE "/var/run/dnsmasq.pid"
|
|
|
|
|
+# define RUNFILE "/run/dnsmasq.pid"
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
