File group_and_isc.patch of Package dnsmasq.3964
--- Makefile | 4 ++-- man/dnsmasq.8 | 1 + src/config.h | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) --- Makefile.orig +++ 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 @@ -157,7 +157,7 @@ $(objs): $(copts_conf) $(hdrs) $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< dnsmasq : $(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) --- man/dnsmasq.8.orig +++ man/dnsmasq.8 @@ -158,6 +158,7 @@ can be over-ridden with this switch. Specify the group which dnsmasq will run 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" .TP .B \-v, --version Print the version number. --- src/config.h.orig +++ src/config.h @@ -28,7 +28,7 @@ #define SERVERS_LOGGED 30 /* Only log this many servers when logging state */ #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 TTL_FLOOR_LIMIT 3600 /* don't allow --min-cache-ttl to raise TTL above this under any circumstances */ #define MAXLEASES 1000 /* maximum number of DHCP leases */ #define PING_WAIT 3 /* wait for ping address-in-use test */ @@ -40,8 +40,8 @@ #define HOSTSFILE "/etc/hosts" #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"
