X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/f1d7d492baa865026add48fa604328c87ac7042e..48608192115031ce77b027693b1a058e727005ee:/zone.lisp

diff --git a/zone.lisp b/zone.lisp
index 8d35c09..a6c4944 100644
--- a/zone.lisp
+++ b/zone.lisp
@@ -207,8 +207,12 @@
   records)
 
 (export '*zone-output-path*)
-(defvar *zone-output-path* *default-pathname-defaults*
-  "Pathname defaults to merge into output files.")
+(defvar *zone-output-path* nil
+  "Pathname defaults to merge into output files.
+
+   If this is nil then use the prevailing `*default-pathname-defaults*'.
+   This is not the same as capturing the `*default-pathname-defaults*' from
+   load time.")
 
 (export '*preferred-subnets*)
 (defvar *preferred-subnets* nil
@@ -221,7 +225,7 @@
   "Choose a file name for a given ZONE and TYPE."
   (merge-pathnames (make-pathname :name (string-downcase zone)
 				  :type (string-downcase type))
-		   *zone-output-path*))
+		   (or *zone-output-path* *default-pathname-defaults*)))
 
 (export 'zone-preferred-subnet-p)
 (defun zone-preferred-subnet-p (name)
@@ -696,12 +700,12 @@
 		 (fixnum what)
 		 (symbol (or (get what prop)
 			     (error "~S is not a known ~A" what prop))))))
-	(dolist (item (listify data)
-		 (destructuring-bind (fpr &key (alg 'rsa) (type 'sha-1))
-		     (listify item)
-		   (rec :data (list (lookup alg 'sshfp-algorithm)
-				    (lookup type 'sshfp-type)
-				    fpr))))))))
+	(dolist (item (listify data))
+	  (destructuring-bind (fpr &key (alg 'rsa) (type 'sha-1))
+	      (listify item)
+	    (rec :data (list (lookup alg 'sshfp-algorithm)
+			     (lookup type 'sshfp-type)
+			     fpr)))))))
 
 (defzoneparse :mx (name data rec :zname zname)
   ":mx ((HOST :prio INT :ip IPADDR)*)"