2007-08-31 10:37:10 +02:00
|
|
|
diff -Nru dnsmasq-2.40.orig/Makefile dnsmasq-2.40/Makefile
|
|
|
|
|
--- dnsmasq-2.40.orig/Makefile 2007-08-30 09:05:20.000000000 +0200
|
|
|
|
|
+++ dnsmasq-2.40/Makefile 2007-08-30 09:08:36.000000000 +0200
|
2006-02-23 16:26:10 +01:00
|
|
|
@@ -1,6 +1,6 @@
|
2007-05-01 08:45:36 +02:00
|
|
|
PREFIX ?= /usr/local
|
|
|
|
|
BINDIR ?= ${PREFIX}/sbin
|
|
|
|
|
-MANDIR ?= ${PREFIX}/share/man
|
|
|
|
|
+MANDIR ?= ${PREFIX}/man
|
|
|
|
|
LOCALEDIR ?= ${PREFIX}/share/locale
|
2006-02-23 16:26:10 +01:00
|
|
|
|
|
|
|
|
SRC = src
|
2007-08-31 10:37:10 +02:00
|
|
|
diff -Nru dnsmasq-2.40.orig/dnsmasq.conf.example dnsmasq-2.40/dnsmasq.conf.example
|
|
|
|
|
--- dnsmasq-2.40.orig/dnsmasq.conf.example 2007-08-30 09:05:20.000000000 +0200
|
|
|
|
|
+++ dnsmasq-2.40/dnsmasq.conf.example 2007-08-30 09:08:36.000000000 +0200
|
2007-05-01 08:45:36 +02:00
|
|
|
@@ -63,8 +63,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=
|
|
|
|
|
+user=nobody
|
|
|
|
|
+group=nobody
|
|
|
|
|
|
|
|
|
|
# If you want dnsmasq to listen for DHCP and DNS requests only on
|
|
|
|
|
# specified interfaces (and the loopback) give the name of the
|
2007-08-31 10:37:10 +02:00
|
|
|
@@ -332,7 +332,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
|
|
|
|
|
+# dhcp-leasefile=/var/lib/dhcp/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,
|
2007-08-31 10:37:10 +02:00
|
|
|
diff -Nru dnsmasq-2.40.orig/src/config.h dnsmasq-2.40/src/config.h
|
|
|
|
|
--- dnsmasq-2.40.orig/src/config.h 2007-08-30 09:05:20.000000000 +0200
|
|
|
|
|
+++ dnsmasq-2.40/src/config.h 2007-08-30 09:08:36.000000000 +0200
|
2006-10-17 20:01:58 +02:00
|
|
|
@@ -36,7 +36,7 @@
|
2006-10-29 10:17:10 +01:00
|
|
|
#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
|
2006-02-23 16:26:10 +01:00
|
|
|
# define LEASEFILE "/var/db/dnsmasq.leases"
|
|
|
|
|
#else
|
|
|
|
|
-# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
|
|
|
|
+# define LEASEFILE "/var/lib/dhcp/dnsmasq.leases"
|
|
|
|
|
#endif
|
|
|
|
|
#if defined(__FreeBSD__)
|
|
|
|
|
# define CONFFILE "/usr/local/etc/dnsmasq.conf"
|
2006-10-17 20:01:58 +02:00
|
|
|
@@ -45,7 +45,7 @@
|
2006-02-23 16:26:10 +01:00
|
|
|
#endif
|
|
|
|
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
|
|
|
|
#define CHUSER "nobody"
|
|
|
|
|
-#define CHGRP "dip"
|
|
|
|
|
+#define CHGRP "nobody"
|
|
|
|
|
#define DHCP_SERVER_PORT 67
|
2006-04-19 09:08:58 +02:00
|
|
|
#define DHCP_CLIENT_PORT 68
|
2007-01-23 16:33:00 +01:00
|
|
|
#define TFTP_PORT 69
|
