--- src/bin/ndc/ndc.c.org	Thu Feb 10 14:57:29 2000
+++ src/bin/ndc/ndc.c	Fri Feb 18 15:36:01 2000
@@ -54,7 +54,7 @@
 
 static const char *	program = "amnesia";
 static enum { e_channel, e_signals } mode = e_channel;
-static char *	channel = _PATH_NDCSOCK;
+static char *	channel = "/home/named" _PATH_NDCSOCK;
 static const char	helpfmt[] = "\t%-16s\t%s\n";
 static const char *	pidfile = _PATH_PIDFILE;
 static sockaddr_t	client, server;
@@ -242,6 +242,7 @@
 builtincmd(void) {
 	static const char spaces[] = " \t";
 	char *rest, syscmd[sizeof cmd + sizeof _PATH_NAMED];
+	char *fixed="-u named -g named -t /home/named";
 	pid_t pid;
 	int save_quiet = quiet;
 	int len;
@@ -254,7 +255,7 @@
 		rest++;
 		rest += strspn(rest, spaces);
 	}
-	sprintf(syscmd, "%s %s", _PATH_NAMED, rest);
+	sprintf(syscmd, "%s %s %s", _PATH_NAMED, rest, fixed);
 	if (strncasecmp(cmd, "start", len) == 0) {
 		if (running(debug, &pid))
 			error("name server already running? (pid %ld)",
--- src/bin/named-xfer/Makefile.org	Sat Feb 19 21:09:55 2000
+++ src/bin/named-xfer/Makefile	Sat Feb 19 21:10:15 2000
@@ -57,7 +57,7 @@
 all: ${PROG}${EXE}
 
 ${PROG}${EXE}: ${OBJS} ${NAMED_OBJS} ${LIBBIND} Makefile
-	${CC} ${CDEBUG} ${LDFLAGS} ${BOUNDS} -o ${PROG}${EXE} ${OBJS} ${NAMED_OBJS} \
+	${CC} ${CDEBUG} ${LDFLAGS} ${BOUNDS} -static -o ${PROG}${EXE} ${OBJS} ${NAMED_OBJS} \
 		${LIBBIND} ${SYSLIBS}
 .c.${O}:
 	${CC} ${CPPFLAGS} ${CFLAGS} ${BOUNDS} -c $*.c
--- src/lib/resolv/res_init.c~	Fri May 21 02:00:51 1999
+++ src/lib/resolv/res_init.c	Wed Feb 23 14:57:49 2000
@@ -472,6 +472,7 @@
 }
 #endif
 
+#if 0 /* defined in glibc? */
 u_int
 res_randomid(void) {
 	struct timeval now;
@@ -479,3 +480,4 @@
 	gettimeofday(&now, NULL);
 	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
 }
+#endif