Update 4.9.3.b9p1 tools to 4.9.3.b24

Note: new program, "ndc", similar to gated's gdc.  This provides a superset
of named.reload and named.restart.

6 files changed, 40 insertions, 26 deletions

diff --git a/usr.sbin/named/tools/Makefile b/usr.sbin/named/tools/Makefile
index 4c6be85..fa23e68 100644
--- a/usr.sbin/named/tools/Makefile
+++ b/usr.sbin/named/tools/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	4.10 (Berkeley) 5/29/90
 
-SUBDIR=	named.reload named.restart nsquery nstest
+SUBDIR=	named.reload named.restart ndc
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/named/tools/named.reload/Makefile b/usr.sbin/named/tools/named.reload/Makefile
index 6df605d..bb71c64 100644
--- a/usr.sbin/named/tools/named.reload/Makefile
+++ b/usr.sbin/named/tools/named.reload/Makefile
@@ -5,13 +5,17 @@ CLEANFILES+=named.reload
 
 PIDDIR=/var/run
 INDOT=
+DESTSBIN=${DESTDIR}${BINDIR}
 
-beforeinstall:	named.reload
+beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    named.reload ${DESTDIR}${BINDIR}
 
+all: named.reload
+
 named.reload: named.reload.sh Makefile
-	sed -e "s|%PIDDIR%|${PIDDIR}|" \
+	sed -e "s|%DESTSBIN%|${DESTSBIN}|" \
+	    -e "s|%INDOT%|${INDOT}|" \
 	    < ${.CURDIR}/named.reload.sh > named.reload
 
 .include "${.CURDIR}/../../../Makefile.inc"
diff --git a/usr.sbin/named/tools/named.reload/named.reload.sh b/usr.sbin/named/tools/named.reload/named.reload.sh
index a25de1b..c800023 100644
--- a/usr.sbin/named/tools/named.reload/named.reload.sh
+++ b/usr.sbin/named/tools/named.reload/named.reload.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -
 #
 #	from named.reload	5.2 (Berkeley) 6/27/89
-#	$Id: named.reload.sh,v 4.9.1.2 1993/09/08 00:01:17 vixie Exp $
+#	$Id: named.reload.sh,v 1.2 1994/09/22 20:45:23 pst Exp $
 #
-kill -HUP `cat %PIDDIR%/named.pid`
+
+exec %DESTSBIN%/%INDOT%ndc reload
diff --git a/usr.sbin/named/tools/named.restart/Makefile b/usr.sbin/named/tools/named.restart/Makefile
index 0c8773d..4c3a700 100644
--- a/usr.sbin/named/tools/named.restart/Makefile
+++ b/usr.sbin/named/tools/named.restart/Makefile
@@ -1,11 +1,12 @@
 #	@(#)Makefile	5.1 (Berkeley) 5/28/90
-#	$Id: Makefile,v 1.3 1995/05/03 03:26:53 rgrimes Exp $
+#	$Id: Makefile,v 1.4 1995/07/25 00:37:31 bde Exp $
 
 MAN8=	named.restart.8
 CLEANFILES+=named.restart
 
 PIDDIR=/var/run
 INDOT=
+DESTSBIN=${DESTDIR}${DESTBIN}
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
@@ -14,8 +15,7 @@ beforeinstall:
 all: named.restart
 
 named.restart: named.restart.sh Makefile
-	sed -e "s|%PIDDIR%|${PIDDIR}|" \
-	    -e "s|%INDOT%|${INDOT}|" \
+	sed -e "s|%INDOT%|${INDOT}|" \
 	    -e "s|%DESTSBIN%|${BINDIR}|" \
 	    < ${.CURDIR}/named.restart.sh > named.restart
 
diff --git a/usr.sbin/named/tools/named.restart/named.restart.sh b/usr.sbin/named/tools/named.restart/named.restart.sh
index a51cf54..eb4c7ec 100644
--- a/usr.sbin/named/tools/named.restart/named.restart.sh
+++ b/usr.sbin/named/tools/named.restart/named.restart.sh
@@ -1,23 +1,7 @@
 #!/bin/sh -
 #
 #	from named.restart	5.4 (Berkeley) 6/27/89
-#	$Id: named.restart.sh,v 1.2 1994/09/22 20:45:26 pst Exp $
+#	$Id: named.restart.sh,v 1.3 1995/05/03 03:26:59 rgrimes Exp $
 #
 
-# If there is a global system configuration file, suck it in.
-if [ -f /etc/sysconfig ]; then
-	. /etc/sysconfig
-fi
-
-PATH=%DESTSBIN%:/bin:/usr/bin
-
-if [ -f %PIDDIR%/named.pid ]; then
-	pid=`cat %PIDDIR%/named.pid`
-	kill $pid
-	sleep 5
-fi
-
-# $namedflags is imported from /etc/sysconfig
-if [ "X${namedflags}" != "XNO" ]; then 
-	exec %INDOT%named ${namedflags}
-fi
+exec %DESTSBIN%/%INDOT%ndc restart
diff --git a/usr.sbin/named/tools/ndc/Makefile b/usr.sbin/named/tools/ndc/Makefile
new file mode 100644
index 0000000..043d510
--- /dev/null
+++ b/usr.sbin/named/tools/ndc/Makefile
@@ -0,0 +1,25 @@
+MAN8=	ndc.8
+CLEANFILES+=ndc
+
+PIDDIR=/var/run
+INDOT=
+PS=ps
+IOT=IOT
+DESTSBIN=${DESTDIR}${BINDIR}
+
+beforeinstall:
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	    ndc ${DESTDIR}${BINDIR}
+
+all: ndc
+
+ndc: ndc.sh Makefile
+	sed -e "s|%DESTSBIN%|${DESTSBIN}|" \
+	    -e "s|%INDOT%|${INDOT}|" \
+	    -e "s|%PIDDIR%|${PIDDIR}|" \
+	    -e "s|%PS%|${PS}|" \
+	    -e "s|%IOT%|${IOT}|" \
+	    < ${.CURDIR}/ndc.sh > ndc
+
+.include "${.CURDIR}/../../../Makefile.inc"
+.include <bsd.prog.mk>