X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/679775ba19206747f3a1682cd0090bdae29c13a2..b23c65ee5879e401cf7e260e104d3d1f8f3a2266:/zone.lisp

diff --git a/zone.lisp b/zone.lisp
index 7318c2a..eaa0e2d 100644
--- a/zone.lisp
+++ b/zone.lisp
@@ -274,13 +274,12 @@
 	   (process (rec dom ttl)
 	     (multiple-value-bind (top sub) (sift rec ttl)
 	       (if (and dom (null top) sub)
-		   (let ((preferred nil))
-		     (dolist (s sub)
-		       (when (some #'zone-preferred-subnet-p
-				   (listify (zs-name s)))
-			 (setf preferred s)))
-		     (unless preferred
-		       (setf preferred (car sub)))
+		   (let ((preferred
+			  (or (find-if (lambda (s)
+					 (some #'zone-preferred-subnet-p
+					       (listify (zs-name s))))
+				       sub)
+			      (car sub))))
 		     (when preferred
 		       (process (zs-records preferred)
 				dom
@@ -398,8 +397,8 @@
     (safely-writing (out file)
       (format out
 	      ";; Serial number file for zone ~A~%~
-               ;;   (LAST-SEQ DAY MONTH YEAR)~%~
-               ~S~%"
+	       ;;   (LAST-SEQ DAY MONTH YEAR)~%~
+	       ~S~%"
 	      name
 	      (cons seq now)))
     (from-mixed-base '(100 100 100) (reverse (cons seq now)))))
@@ -411,7 +410,7 @@
   "Parse the HEAD of a zone form.  This has the form
 
      (NAME &key :source :admin :refresh :retry
-                :expire :min-ttl :ttl :serial)
+		:expire :min-ttl :ttl :serial)
 
    though a singleton NAME needn't be a list.  Returns the default TTL and an
    soa structure representing the zone head."
@@ -450,8 +449,8 @@
 (export 'defzoneparse)
 (defmacro defzoneparse (types (name data list
 			       &key (prefix (gensym "PREFIX"))
-			            (zname (gensym "ZNAME"))
-			            (ttl (gensym "TTL")))
+				    (zname (gensym "ZNAME"))
+				    (ttl (gensym "TTL")))
 			&body body)
   "Define a new zone record type (or TYPES -- a list of synonyms is
    permitted).  The arguments are as follows:
@@ -653,7 +652,7 @@
       (rec :name (zone-parse-host "mask" name)
 	   :type :a
 	   :data (ipnet-mask n))
-      (rec :name (zone-parse-host "broadcast" name)
+      (rec :name (zone-parse-host "bcast" name)
 	   :type :a
 	   :data (ipnet-broadcast n)))))
 
@@ -708,37 +707,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.