~mdw
/
zone
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zone.lisp: Clean up whitespace.
[zone]
/
zone.lisp
diff --git
a/zone.lisp
b/zone.lisp
index
751baff
..
eaa0e2d
100644
(file)
--- 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)
(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
(when preferred
(process (zs-records preferred)
dom
@@
-398,8
+397,8
@@
(safely-writing (out file)
(format out
";; Serial number file for zone ~A~%~
(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)))))
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
"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."
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"))
(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:
&body body)
"Define a new zone record type (or TYPES -- a list of synonyms is
permitted). The arguments are as follows: