2012-12-14 16:55:14 +01:00
|
|
|
---
|
|
|
|
|
Makefile | 4 ++--
|
|
|
|
|
man/dnsmasq.8 | 1 +
|
|
|
|
|
src/config.h | 6 +++---
|
|
|
|
|
3 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
|
|
|
|
@@ -18,7 +18,7 @@
|
|
|
|
|
|
|
|
|
|
# Variables you may well want to override.
|
|
|
|
|
|
|
|
|
|
-PREFIX = /usr/local
|
|
|
|
|
+PREFIX = /usr
|
|
|
|
|
BINDIR = $(PREFIX)/sbin
|
|
|
|
|
MANDIR = $(PREFIX)/share/man
|
|
|
|
|
LOCALEDIR = $(PREFIX)/share/locale
|
|
|
|
|
@@ -127,7 +127,7 @@ $(objs:.o=.c) $(hdrs):
|
|
|
|
|
$(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<
|
|
|
|
|
|
|
|
|
|
dnsmasq : .configured $(hdrs) $(objs)
|
|
|
|
|
- $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
|
|
|
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
|
|
|
|
|
|
|
|
|
|
dnsmasq.pot : $(objs:.o=.c) $(hdrs)
|
|
|
|
|
$(XGETTEXT) -d dnsmasq --foreign-user --omit-header --keyword=_ -o $@ -i $(objs:.o=.c)
|
|
|
|
|
--- a/man/dnsmasq.8
|
|
|
|
|
+++ b/man/dnsmasq.8
|
|
|
|
|
@@ -125,6 +125,7 @@ can be over-ridden with this switch.
|
2007-01-16 00:10:19 +01:00
|
|
|
Specify the group which dnsmasq will run
|
2012-12-14 16:55:14 +01:00
|
|
|
as. The defaults to "dip", if available, to facilitate access to
|
|
|
|
|
/etc/ppp/resolv.conf which is not normally world readable.
|
|
|
|
|
+as. The defaults to "nogroup"
|
2007-01-16 00:10:19 +01:00
|
|
|
.TP
|
|
|
|
|
.B \-v, --version
|
2012-03-06 10:48:01 +01:00
|
|
|
Print the version number.
|
2012-12-14 16:55:14 +01:00
|
|
|
--- a/src/config.h
|
|
|
|
|
+++ b/src/config.h
|
2012-06-28 08:18:18 +02:00
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
|
#define FORWARD_TIME 20 /* or 20 seconds */
|
|
|
|
|
#define RANDOM_SOCKS 64 /* max simultaneous random ports */
|
|
|
|
|
#define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */
|
|
|
|
|
-#define CACHESIZ 150 /* default cache size */
|
|
|
|
|
+#define CACHESIZ 2000 /* default cache size */
|
|
|
|
|
#define MAXLEASES 1000 /* maximum number of DHCP leases */
|
|
|
|
|
#define PING_WAIT 3 /* wait for ping address-in-use test */
|
|
|
|
|
#define PING_CACHE_TIME 30 /* Ping test assumed to be valid this long. */
|
2012-12-14 16:55:14 +01:00
|
|
|
@@ -34,8 +34,8 @@
|
|
|
|
|
#define HOSTSFILE "/etc/hosts"
|
2012-03-06 10:39:04 +01:00
|
|
|
#define ETHERSFILE "/etc/ethers"
|
|
|
|
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
|
|
|
|
-#define CHUSER "nobody"
|
|
|
|
|
-#define CHGRP "dip"
|
|
|
|
|
+#define CHUSER "dnsmasq"
|
|
|
|
|
+#define CHGRP "nogroup"
|
|
|
|
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
|
|
|
|
#define LOG_MAX 5 /* log-queue length */
|
|
|
|
|
#define RANDFILE "/dev/urandom"
|
