enable bind now; some diffs from jakob, some from me

8 files changed, 67 insertions, 64 deletions

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 4c3c63126da..a8c613f3d7f 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1560,7 +1560,6 @@
 ./usr/sbin/dhcpd
 ./usr/sbin/dhcrelay
 ./usr/sbin/dig
-./usr/sbin/dnsquery
 ./usr/sbin/editmap
 ./usr/sbin/edquota
 ./usr/sbin/ext_srvtab
@@ -1606,9 +1605,6 @@
 ./usr/sbin/moptrace
 ./usr/sbin/mtree
 ./usr/sbin/named
-./usr/sbin/named.reload
-./usr/sbin/named.restart
-./usr/sbin/ndc
 ./usr/sbin/ndp
 ./usr/sbin/netgroup_mkdb
 ./usr/sbin/nslookup
@@ -2043,7 +2039,6 @@
 ./usr/share/misc/mdoc.template
 ./usr/share/misc/more.help
 ./usr/share/misc/na.phone
-./usr/share/misc/nslookup.help
 ./usr/share/misc/scsi_modes
 ./usr/share/misc/termcap
 ./usr/share/misc/termcap.db
@@ -4054,8 +4049,6 @@
 ./var/named
 ./var/named/dev
 ./var/named/etc
-./var/named/named-xfer
-./var/named/namedb
 ./var/preserve
 ./var/quotas
 ./var/run
@@ -4098,3 +4091,8 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
+./usr/sbin/named-checkconf
+./usr/sbin/named-checkzone
+./usr/sbin/nsupdate
+./usr/sbin/rndc
+./usr/sbin/rndc-confgen
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index d13b36d7d08..2fc208125bc 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -139,11 +139,17 @@
 ./var/log/xferlog
 ./var/mail/root
 ./var/msgs/bounds
-./var/named/named.boot
-./var/named/namedb/localhost.rev
-./var/named/namedb/localhost.v6.rev
-./var/named/namedb/localhost.zone
-./var/named/namedb/root.cache
+./var/named/etc/named-dual.conf
+./var/named/standard/root.hint
+./var/named/etc/named-simple.conf
+./var/named/etc/named.conf
+./var/named/master
+./var/named/slave
+./var/named/standard
+./var/named/standard/localhost
+./var/named/standard/loopback
+./var/named/standard/loopback6.arpa
+./var/named/standard/loopback6.int
 ./var/run/utmp
 ./var/www/cgi-bin/printenv
 ./var/www/cgi-bin/test-cgi
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index eda9d68e320..27e6e41dd58 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -237,7 +237,6 @@
 ./usr/share/man/cat1/dig.0
 ./usr/share/man/cat1/dirname.0
 ./usr/share/man/cat1/dirs.0
-./usr/share/man/cat1/dnsquery.0
 ./usr/share/man/cat1/domainname.0
 ./usr/share/man/cat1/dprofpp.0
 ./usr/share/man/cat1/du.0
@@ -1877,13 +1876,9 @@
 ./usr/share/man/cat8/mvme68k/installboot.0
 ./usr/share/man/cat8/mvme88k
 ./usr/share/man/cat8/mvmeppc
-./usr/share/man/cat8/named-xfer.0
 ./usr/share/man/cat8/named.0
-./usr/share/man/cat8/named.reload.0
-./usr/share/man/cat8/named.restart.0
 ./usr/share/man/cat8/ncheck.0
 ./usr/share/man/cat8/ncheck_ffs.0
-./usr/share/man/cat8/ndc.0
 ./usr/share/man/cat8/ndp.0
 ./usr/share/man/cat8/netgroup_mkdb.0
 ./usr/share/man/cat8/netstart.0
@@ -2213,3 +2208,9 @@
 ./usr/share/texinfo
 ./usr/share/texinfo/texinfo.dtd
 ./usr/share/texinfo/texinfo.xsl
+./usr/share/man/cat5/rndc.conf.0
+./usr/share/man/cat8/named-checkconf.0
+./usr/share/man/cat8/named-checkzone.0
+./usr/share/man/cat8/nsupdate.0
+./usr/share/man/cat8/rndc-confgen.0
+./usr/share/man/cat8/rndc.0
diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index 9d5d3742ae7..46c62d6f9d6 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -163,26 +163,6 @@
 ./usr/share/doc/smm/09.sendmail
 ./usr/share/doc/smm/09.sendmail/Makefile
 ./usr/share/doc/smm/09.sendmail/intro.me
-./usr/share/doc/smm/10.named
-./usr/share/doc/smm/10.named/00macs.me
-./usr/share/doc/smm/10.named/00title.me
-./usr/share/doc/smm/10.named/Makefile
-./usr/share/doc/smm/10.named/ack.me
-./usr/share/doc/smm/10.named/build.me
-./usr/share/doc/smm/10.named/files.me
-./usr/share/doc/smm/10.named/intro.me
-./usr/share/doc/smm/10.named/manage.me
-./usr/share/doc/smm/10.named/named.boot.cache
-./usr/share/doc/smm/10.named/named.boot.primary
-./usr/share/doc/smm/10.named/named.boot.secondary
-./usr/share/doc/smm/10.named/named.local
-./usr/share/doc/smm/10.named/ns.me
-./usr/share/doc/smm/10.named/resolv.conf
-./usr/share/doc/smm/10.named/root.cache
-./usr/share/doc/smm/10.named/setup.me
-./usr/share/doc/smm/10.named/types.me
-./usr/share/doc/smm/10.named/ucbhosts
-./usr/share/doc/smm/10.named/ucbhosts.rev
 ./usr/share/doc/smm/11.timedop
 ./usr/share/doc/smm/12.timed
 ./usr/share/doc/smm/13.amd
@@ -276,3 +256,13 @@
 ./usr/share/doc/usd/31.trek/trek.me
 ./usr/share/doc/usd/Makefile
 ./usr/share/doc/usd/Title
+./usr/share/doc/html/bind/Bv9ARM.ch01.html
+./usr/share/doc/html/bind/Bv9ARM.ch02.html
+./usr/share/doc/html/bind/Bv9ARM.ch03.html
+./usr/share/doc/html/bind/Bv9ARM.ch04.html
+./usr/share/doc/html/bind/Bv9ARM.ch05.html
+./usr/share/doc/html/bind/Bv9ARM.ch06.html
+./usr/share/doc/html/bind/Bv9ARM.ch07.html
+./usr/share/doc/html/bind/Bv9ARM.ch08.html
+./usr/share/doc/html/bind/Bv9ARM.ch09.html
+./usr/share/doc/html/bind/Bv9ARM.html
diff --git a/etc/Makefile b/etc/Makefile
index 66120ab5325..2b14cbdeddd 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.174 2002/12/31 16:22:25 miod Exp $
+#	$OpenBSD: Makefile,v 1.175 2003/02/04 01:35:08 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	US/Pacific
@@ -31,7 +31,6 @@ BIN1+=	wsconsctl.conf
 # -rw-rw-r--
 BIN2=	motd
 
-NAMEDB=	localhost.rev localhost.v6.rev localhost.zone root.cache
 PCS=	pcs750.bin
 WCS1=	wcs fppwcs poc poc1 poc2 fppoc
 WCS2=	fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual
@@ -167,11 +166,21 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/etc/systrace; \
 		${INSTALL} -c -o root -g wheel -m 600 usr_sbin_named \
 		    ${DESTDIR}/etc/systrace;
-	cd namedb; \
-	    ${INSTALL} -c -o root -g ${BINGRP} -m 644 named.boot \
-		${DESTDIR}/var/named; \
-	    ${INSTALL} -c -o named -g ${BINGRP} -m 644 ${NAMEDB} \
-		${DESTDIR}/var/named/namedb
+	cd bind; \
+		${INSTALL} -c -o root -g named -m 640 named-simple.conf \
+		    ${DESTDIR}/var/named/etc/named.conf; \
+		${INSTALL} -c -o root -g named -m 640 named-*.conf \
+		    ${DESTDIR}/var/named/etc; \
+		${INSTALL} -c -o root -g wheel -m 644 db.localhost \
+		    ${DESTDIR}/var/named/standard/localhost; \
+		${INSTALL} -c -o root -g wheel -m 644 db.loopback \
+		    ${DESTDIR}/var/named/standard/loopback; \
+		${INSTALL} -c -o root -g wheel -m 644 db.loopback6.arpa \
+		    ${DESTDIR}/var/named/standard/loopback6.arpa; \
+		${INSTALL} -c -o root -g wheel -m 644 db.loopback6.int \
+		    ${DESTDIR}/var/named/standard/loopback6.int; \
+		${INSTALL} -c -o root -g wheel -m 644 root.hint \
+		    ${DESTDIR}/var/named/standard; \
 	/bin/rm -f ${DESTDIR}/etc/localtime
 	ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
 	/bin/rm -f ${DESTDIR}/etc/rmt
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index cf286e631a3..f6b0f9d28c6 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.142 2003/01/29 07:32:20 jakob Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.143 2003/02/04 01:35:08 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -701,11 +701,6 @@ smm
 # ./usr/share/doc/smm/09.sendmail
 ..
 
-# ./usr/share/doc/smm/10.named
-10.named
-# ./usr/share/doc/smm/10.named
-..
-
 # ./usr/share/doc/smm/11.timedop
 11.timedop
 # ./usr/share/doc/smm/11.timedop
@@ -1912,13 +1907,23 @@ dev
 ..
 
 # ./var/named/etc
-etc
+etc		uname=root gname=named mode=0750
 # ./var/named/etc
 ..
 
-# ./var/named/namedb
-namedb		uname=named gname=bin mode=0755
-# ./var/named/namedb
+# ./var/named/master
+master
+# ./var/named/master
+..
+
+# ./var/named/slave
+slave		uname=root gname=named mode=0775
+# ./var/named/slave
+..
+
+# ./var/named/standard
+standard
+# ./var/named/standard
 ..
 
 # ./var/named
diff --git a/etc/mtree/4.4BSD.usr b/etc/mtree/4.4BSD.usr
index 84a6d3bd373..78fe7305a0b 100644
--- a/etc/mtree/4.4BSD.usr
+++ b/etc/mtree/4.4BSD.usr
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.usr,v 1.16 2002/05/23 18:43:00 deraadt Exp $
+#	$OpenBSD: 4.4BSD.usr,v 1.17 2003/02/04 01:35:09 deraadt Exp $
 #	$NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $
 #
 #	   user: bostic
@@ -963,12 +963,6 @@ vax             type=dir uname=root gname=wheel mode=0775
 ..
 
 
-# ./share/doc/smm/10.named
-10.named        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/smm/10.named
-..
-
-
 # ./share/doc/smm/11.timedop
 /set type=file gname=bin uname=root mode=0444
 11.timedop      type=dir uname=root gname=wheel mode=0775
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 03f2addee2d..31f2df30f36 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,15 +1,15 @@
-#	$OpenBSD: Makefile,v 1.92 2002/12/31 16:22:26 miod Exp $
+#	$OpenBSD: Makefile,v 1.93 2003/02/04 01:35:08 deraadt Exp $
 
 # not yet done: catman
 
 .include <bsd.own.mk>
 
 SUBDIR=	ac accton adduser amd arp authpf \
-	bootpd bootpgw bootpef bootptest \
+	bind bootpd bootpgw bootpef bootptest \
 	chroot config cron dev_mkdb dhcp \
 	edquota httpd inetd iostat \
 	kgmon kvm_mkdb lpr \
-	mailwrapper mopd mtree named \
+	mailwrapper mopd mtree \
 	netgroup_mkdb openssl pkg pkg_install popa3d portmap ppp pppd pppoe \
 	pstat pwd_mkdb quot quotaon rarpd rbootd rdconfig rdate repquota rmt \
 	rpc.bootparamd rpc.lockd rpc.pcnfsd rwhod \