blob: 31fe580728efc39d797f4c611fa58310a9b2fc02 (
plain)
1 diff -Nru dnsmasq-2.79.orig/dnsmasq.conf.example dnsmasq-2.79/dnsmasq.conf.example
2 --- dnsmasq-2.79.orig/dnsmasq.conf.example 2018-04-04 12:11:55.871714531 +0200
3 +++ dnsmasq-2.79/dnsmasq.conf.example 2018-04-04 12:14:52.416900426 +0200
4 @@ -22,7 +22,7 @@
5
6 # Uncomment these to enable DNSSEC validation and caching:
7 # (Requires dnsmasq to be built with DNSSEC option.)
8 -#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf
9 +#conf-file=/usr/share/dnsmasq/trust-anchors.conf
10 #dnssec
11
12 # Replies which are not DNSSEC signed may be legitimate, because the domain
13 @@ -96,8 +96,8 @@
14
15 # If you want dnsmasq to change uid and gid to something other
16 # than the default, edit the following lines.
17 -#user=
18 -#group=
19 +#user=nobody
20 +#group=nobody
21
22 # If you want dnsmasq to listen for DHCP and DNS requests only on
23 # specified interfaces (and the loopback) give the name of the
24 @@ -535,7 +535,7 @@
25 # The DHCP server needs somewhere on disk to keep its lease database.
26 # This defaults to a sane location, but if you want to change it, use
27 # the line below.
28 -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
29 +#dhcp-leasefile=/var/lib/dhcp/dnsmasq.leases
30
31 # Set the DHCP server to authoritative mode. In this mode it will barge in
32 # and take over the lease for any client which broadcasts on the network,
33 diff -Nru dnsmasq-2.79.orig/src/config.h dnsmasq-2.79/src/config.h
34 --- dnsmasq-2.79.orig/src/config.h 2018-04-04 12:11:55.868381226 +0200
35 +++ dnsmasq-2.79/src/config.h 2018-04-04 12:12:12.708240101 +0200
36 @@ -44,7 +44,7 @@
37 #define ETHERSFILE "/etc/ethers"
38 #define DEFLEASE 3600 /* default lease time, 1 hour */
39 #define CHUSER "nobody"
40 -#define CHGRP "dip"
41 +#define CHGRP "nobody"
42 #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
43 #define LOG_MAX 5 /* log-queue length */
44 #define RANDFILE "/dev/urandom"
45 @@ -190,7 +190,7 @@
46 # elif defined(__ANDROID__)
47 # define LEASEFILE "/data/misc/dhcp/dnsmasq.leases"
48 # else
49 -# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
50 +# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases"
51 # endif
52 #endif
53
|