From 4440be0decb5ad76b2d33c8d59c829d3bcbb3a69 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 11 Mar 2012 04:50:55 +0000
Subject: [PATCH] zone.lisp: Reverse delegation for multiple subnets into the
 same target.

Just a notational convenience.
---
 zone.lisp | 63 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/zone.lisp b/zone.lisp
index 7318c2a..05af14f 100644
--- a/zone.lisp
+++ b/zone.lisp
@@ -708,37 +708,38 @@
     (unless bytes
       (setf bytes (ipnet-changeable-bytes (ipnet-mask net))))
     (dolist (map (or (cdr data) (list (list net))))
-      (destructuring-bind (tnet &optional tdom) (listify map)
-	(setf tnet (zone-parse-net tnet name))
-	(unless (ipnet-subnetp net tnet)
-	  (error "~A is not a subnet of ~A."
-		 (ipnet-pretty tnet)
-		 (ipnet-pretty net)))
-	(unless tdom
-	  (with-ipnet (net mask) tnet
-	    (setf tdom
-		  (join-strings
-		   #\.
-		   (append (reverse (loop
-				     for i from (1- bytes) downto 0
-				     until (zerop (logand mask
-							  (ash #xff
-							       (* 8 i))))
-				     collect (ldb (byte 8 (* i 8)) net)))
-			   (list name))))))
-	(setf tdom (string-downcase (stringify tdom)))
-	(dotimes (i (ipnet-hosts tnet))
-	  (unless (zerop i)
-	    (let* ((addr (ipnet-host tnet i))
-		   (tail (join-strings #\.
-				       (loop
-					for i from 0 below bytes
-					collect
-					(logand #xff
-						(ash addr (* 8 i)))))))
-	      (rec :name (format nil "~A.~A" tail name)
-		   :type :cname
-		   :data (format nil "~A.~A" tail tdom)))))))))
+      (destructuring-bind (tnets &optional tdom) (listify map)
+	(dolist (tnet (listify tnets))
+	  (setf tnet (zone-parse-net tnet name))
+	  (unless (ipnet-subnetp net tnet)
+	    (error "~A is not a subnet of ~A."
+		   (ipnet-pretty tnet)
+		   (ipnet-pretty net)))
+	  (unless tdom
+	    (with-ipnet (net mask) tnet
+	      (setf tdom
+		    (join-strings
+		     #\.
+		     (append (reverse (loop
+				       for i from (1- bytes) downto 0
+				       until (zerop (logand mask
+							    (ash #xff
+								 (* 8 i))))
+				       collect (ldb (byte 8 (* i 8)) net)))
+			     (list name))))))
+	  (setf tdom (string-downcase (stringify tdom)))
+	  (dotimes (i (ipnet-hosts tnet))
+	    (unless (zerop i)
+	      (let* ((addr (ipnet-host tnet i))
+		     (tail (join-strings #\.
+					 (loop
+					  for i from 0 below bytes
+					  collect
+					  (logand #xff
+						  (ash addr (* 8 i)))))))
+		(rec :name (format nil "~A.~A" tail name)
+		     :type :cname
+		     :data (format nil "~A.~A" tail tdom))))))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Zone file output.
-- 
2.11.0