X-Git-Url: https://git.distorted.org.uk/~mdw/zone/blobdiff_plain/baad8564bdf6f31b2575b730aa82bace5752f074..75f39e1a706ce77daec78c32b41a123c8f7be82c:/zone.lisp

diff --git a/zone.lisp b/zone.lisp
index 38c79f0..762c6e2 100644
--- a/zone.lisp
+++ b/zone.lisp
@@ -622,6 +622,48 @@
   ":txt TEXT"
   (rec :data data))
 
+(defzoneparse :dkim (name data rec)
+  ":dkim (KEYFILE {:TAG VALUE}*)"
+  (destructuring-bind (file &rest plist) (listify data)
+    (let ((things nil) (out nil))
+      (labels ((flush ()
+		 (when out
+		   (push (get-output-stream-string out) things)
+		   (setf out nil)))
+	       (emit (text)
+		 (let ((len (length text)))
+		   (when (and out (> (+ (file-position out)
+					(length text))
+				     64))
+		     (flush))
+		   (when (plusp len)
+		     (cond ((< len 64)
+			    (unless out (setf out (make-string-output-stream)))
+			    (write-string text out))
+			   (t
+			    (do ((i 0 j)
+				 (j 64 (+ j 64)))
+				((>= i len))
+			      (push (subseq text i (min j len)) things))))))))
+	(do ((p plist (cddr p)))
+	    ((endp p))
+	  (emit (format nil "~(~A~)=~A;" (car p) (cadr p))))
+	(emit (with-output-to-string (out)
+		(write-string "p=" out)
+		(when file
+		  (with-open-file (in file :direction :input)
+		    (loop
+		      (when (string= (read-line in)
+				     "-----BEGIN PUBLIC KEY-----")
+			(return)))
+		    (loop
+		      (let ((line (read-line in)))
+			(if (string= line "-----END PUBLIC KEY-----")
+			    (return)
+			    (write-string line out)))))))))
+      (rec :type :txt
+	   :data (nreverse things)))))
+
 (defzoneparse :mx (name data rec :zname zname)
   ":mx ((HOST :prio INT :ip IPADDR)*)"
   (dolist (mx (listify data))
@@ -786,6 +828,7 @@
   "Stream to write zone data on.")
 
 (defmethod zone-write :around (format zone stream)
+  (declare (ignore format))
   (let ((*writing-zone* zone)
 	(*zone-output-stream* stream))
     (call-next-method)))
@@ -894,6 +937,8 @@ $TTL ~2@*~D~2%"
   (:method ((type (eql :srv)) data)
     (destructuring-bind (prio weight port host) data
       (list "~2D ~5D ~5D ~A" prio weight port (bind-hostname host))))
-  (:method ((type (eql :txt)) data) (list "~S" (stringify data))))
+  (:method ((type (eql :txt)) data)
+    (cons "~#[\"\"~;~S~:;(~@{~%~8T~S~} )~]"
+	  (mapcar #'stringify (listify data)))))
 
 ;;;----- That's all, folks --------------------------------------------------