revert back to using local zones for localhost. and IPv4/IPv6 reverse until

we've found a better solution for chrooted applications.

6 files changed, 88 insertions, 3 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 9a303882c0e..ca0722120ab 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.257 2007/12/16 21:34:56 jakob Exp $
+#	$OpenBSD: Makefile,v 1.258 2008/01/03 21:20:24 jakob Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -171,6 +171,12 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/var/named/etc; \
 		${INSTALL} -c -o root -g wheel -m 644 root.hint \
 		    ${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; \
 	/bin/rm -f ${DESTDIR}/etc/localtime
 	ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
 	/bin/rm -f ${DESTDIR}/etc/rmt
diff --git a/etc/bind/db.localhost b/etc/bind/db.localhost
new file mode 100644
index 00000000000..98a4481576d
--- /dev/null
+++ b/etc/bind/db.localhost
@@ -0,0 +1,15 @@
+; $OpenBSD: db.localhost,v 1.4 2008/01/03 21:20:25 jakob Exp $
+
+$ORIGIN localhost.
+$TTL 6h
+
+@	IN	SOA	localhost. root.localhost. (
+			1	; serial
+			1h	; refresh
+			30m	; retry
+			7d	; expiration
+			1h )	; minimum
+
+		NS	localhost.
+		A	127.0.0.1
+		AAAA	::1
diff --git a/etc/bind/db.loopback b/etc/bind/db.loopback
new file mode 100644
index 00000000000..2764acb289b
--- /dev/null
+++ b/etc/bind/db.loopback
@@ -0,0 +1,14 @@
+; $OpenBSD: db.loopback,v 1.4 2008/01/03 21:20:25 jakob Exp $
+
+$ORIGIN 127.in-addr.arpa.
+$TTL 6h
+
+@	IN	SOA	localhost. root.localhost. (
+			1	; serial
+			1h	; refresh
+			30m	; retry
+			7d	; expiration
+			1h )	; minimum
+
+		NS	localhost.
+1.0.0		PTR	localhost.
diff --git a/etc/bind/db.loopback6.arpa b/etc/bind/db.loopback6.arpa
new file mode 100644
index 00000000000..bf39d302a4a
--- /dev/null
+++ b/etc/bind/db.loopback6.arpa
@@ -0,0 +1,14 @@
+; $OpenBSD: db.loopback6.arpa,v 1.4 2008/01/03 21:20:25 jakob Exp $
+
+$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.
+$TTL 6h
+
+@	IN	SOA	localhost. root.localhost. (
+			1	; serial
+			1h	; refresh
+			30m	; retry
+			7d	; expiration
+			1h )	; minimum
+
+		NS	localhost.
+1		PTR	localhost.
diff --git a/etc/bind/named-dual.conf b/etc/bind/named-dual.conf
index 4ce155d3b1b..6b6a247a315 100644
--- a/etc/bind/named-dual.conf
+++ b/etc/bind/named-dual.conf
@@ -1,4 +1,4 @@
-// $OpenBSD: named-dual.conf,v 1.8 2007/12/16 21:34:56 jakob Exp $
+// $OpenBSD: named-dual.conf,v 1.9 2008/01/03 21:20:25 jakob Exp $
 //
 // Example file for a named configuration with dual views,
 // one processing recursive queries only and one processing
@@ -38,6 +38,24 @@ view "recursive" {
 		file "etc/root.hint";
 	};
 
+	zone "localhost" {
+		type master;
+		file "standard/localhost";
+		allow-transfer { localhost; };
+	};
+
+	zone "127.in-addr.arpa" {
+		type master;
+		file "standard/loopback";
+		allow-transfer { localhost; };
+	};
+
+	zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" {
+		type master;
+		file "standard/loopback6.arpa";
+		allow-transfer { localhost; };
+	};
+
 	zone "com" {
 		type delegation-only;
 	};
diff --git a/etc/bind/named-simple.conf b/etc/bind/named-simple.conf
index b50219566a4..3da03a7396e 100644
--- a/etc/bind/named-simple.conf
+++ b/etc/bind/named-simple.conf
@@ -1,4 +1,4 @@
-// $OpenBSD: named-simple.conf,v 1.7 2007/12/16 21:34:56 jakob Exp $
+// $OpenBSD: named-simple.conf,v 1.8 2008/01/03 21:20:25 jakob Exp $
 //
 // Example file for a simple named configuration, processing both
 // recursive and authoritative queries using one cache.
@@ -36,6 +36,24 @@ zone "." {
 	file "etc/root.hint";
 };
 
+zone "localhost" {
+	type master;
+	file "standard/localhost";
+	allow-transfer { localhost; };
+};
+
+zone "127.in-addr.arpa" {
+	type master;
+	file "standard/loopback";
+	allow-transfer { localhost; };
+};
+
+zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" {
+	type master;
+	file "standard/loopback6.arpa";
+	allow-transfer { localhost; };
+};
+
 zone "com" {
 	type delegation-only;
 };