zone.lisp, frontend.lisp: New configuration-variable machinery.

[zone] / zone.lisp

diff --git a/zone.lisp b/zone.lisp
index 7db70b1..e43e017 100644 (file)
--- a/zone.lisp
+++ b/zone.lisp
@@ -35,6 +35,14 @@
 ;;;--------------------------------------------------------------------------
 ;;; Various random utilities.
 
+(export '*zone-config*)
+(defparameter *zone-config* nil
+  "A list of configuration variables.
+
+   This is for the benefit of the frontend, which will dynamically bind them
+   so that input files can override them independently.  Not intended for use
+   by users.")
+
 (defun to-integer (x)
   "Convert X to an integer in the most straightforward way."
   (floor (rational x)))
@@ -868,6 +876,7 @@
 (defvar *dkim-pathname-defaults*
   (make-pathname :directory '(:relative "keys")
                 :type "dkim"))
+(pushnew '*dkim-pathname-defaults* *zone-config*)
 
 (defzoneparse :dkim (name data rec)
   ":dkim (KEYFILE {:TAG VALUE}*)"
@@ -919,8 +928,9 @@
 
 (export '*sshfp-pathname-defaults*)
 (defvar *sshfp-pathname-defaults*
-  (make-pathname :directory '(:relative "keys")
-                :type "sshfp"))
+  (make-pathname :directory '(:relative "keys") :type "sshfp")
+  "Default pathname components for SSHFP records.")
+(pushnew '*sshfp-pathname-defaults* *zone-config*)
 
 (defzoneparse :sshfp (name data rec)
   ":sshfp { FILENAME | ((FPR :alg ALG :type HASH)*) }"
@@ -1396,7 +1406,8 @@
          (error "Unknown zone `~A'." z))
        (let ((stream (safely-open-output-stream safe
                                                 (zone-file-name z :zone))))
-         (zone-write format zz stream))))))
+         (zone-write format zz stream)
+         (close stream))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Bind format output.