hosts.lisp, distorted.lisp: Fix static/DHCP subnet arrangements.

[zones] / distorted.lisp

diff --git a/distorted.lisp b/distorted.lisp
index 30a2b249f1d3f0c9d935d06507e338652f216e58..d32bba5e400f7b78def8f33610e67996b3e237a2 100644 (file)
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -450,7 +450,8 @@ (defrevzone trusted
             precision.distorted.org.uk.
             telecaster.distorted.org.uk.
             national.distorted.org.uk.))
-  :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
+  :multi (((unsafe-dhcp01 unsafe-dhcp1x safe-dhcp011 safe-dhcp1xx)
+          :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
 #+view/outside
 (defzone dhcp.199.29.172.in-addr.arpa
@@ -516,7 +517,14 @@ (defrevzone jump-ipv6
        eggle.distorted.org.uk.)
   :reverse ((((:ipv6 jump-ipv6)))))
 
-(defrevzone (dhcp :family :ipv6)
+(defrevzone (unsafe-dhcp :family :ipv6)
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       national.distorted.org.uk.
+       eggle.distorted.org.uk.))
+
+(defrevzone (safe-dhcp :family :ipv6)
   :ns (radius.distorted.org.uk.
        precision.distorted.org.uk.
        telecaster.distorted.org.uk.