From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 15 Aug 2007 07:57:11 +0000 (+0100)
Subject: Add delegated reverse-zone for DHCP-allocated addresses.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/commitdiff_plain/b3f752147dd200983d0420b17b8acaabc04c01e7?ds=inline

Add delegated reverse-zone for DHCP-allocated addresses.
---

diff --git a/Makefile.m4 b/Makefile.m4
index fa220a3..9d64f8a 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -35,7 +35,9 @@ m4_divert(-1)
 ### Domains.
 
 DOMAIN([distorted], [inet, fretwank],
-	[distorted.org.uk, 198.29.172.in-addr.arpa, 199.29.172.in-addr.arpa])
+	[distorted.org.uk, dhcp.distorted.org.uk,
+	 198.29.172.in-addr.arpa,
+	 199.29.172.in-addr.arpa, dhcp.199.29.172.in-addr.arpa])
 DOMAIN([harlequin], [inet], [harlequin.org.uk])
 
 m4_divert(0)
diff --git a/distorted.lisp b/distorted.lisp
index 6c0e490..55cf783 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -81,15 +81,31 @@ (defzone distorted.org.uk
   (fuzzface (virtual :a fuzzface))
   (mz (virtual :a mz))
   ;;
+  ;; Delegations
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  ;;
   ;; Networks
   (fretwank :net fretwank)
-  (dhcp :net dhcp)
   (wireless :net wireless)
   (virtual :net virtual))
 
 (defrevzone trusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
-  :reverse trusted)
+  :reverse trusted
+  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
+  #+subnet/fretwank (@ :cidr-delegation
+		       (dhcp
+			(dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+
 (defrevzone untrusted
   :ns ((metalzone.ns :ip metalzone) (vampire.ns :ip vampire))
   :reverse untrusted)
+
+(defzone dhcp.distorted.org.uk
+  :ns (metalzone.ns.distorted.org.uk.
+       vampire.ns.distorted.org.uk.)
+  :net dhcp)
+
+(defzone dhcp.199.29.172.in-addr.arpa
+  :ns (metalzone.ns.199.29.172.in-addr.arpa.
+       vampire.ns.199.29.172.in-addr.arpa.))