(spam-check-blackholes): exit the loop if matches are

found (idea from Adrian Lanz <lanz@fowi.ethz.ch>)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25fb007..0f13b50 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-03  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-check-blackholes): exit the loop if matches are
+       found (idea from Adrian Lanz <lanz@fowi.ethz.ch>)
+
 2003-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-decode.el (mm-attachment-file-modes): Change the default

diff --git a/lisp/spam.el b/lisp/spam.el
index 406c952..7f4c158 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -783,19 +783,20 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
        (dolist (ip ips)
          (unless (and spam-blackhole-good-server-regex
                       (string-match spam-blackhole-good-server-regex ip))
-           (let ((query-string (concat ip "." server)))
-             (if spam-use-dig
-                 (let ((query-result (query-dig query-string)))
-                   (when query-result
-                     (gnus-message 5 "(DIG): positive blackhole check '%s'" 
-                                   query-result)
-                     (push (list ip server query-result)
-                           matches)))
-               ;; else, if not using dig.el
-               (when (query-dns query-string)
-                 (gnus-message 5 "positive blackhole check")
-                 (push (list ip server (query-dns query-string 'TXT))
-                       matches))))))))
+           (unless matches
+             (let ((query-string (concat ip "." server)))
+               (if spam-use-dig
+                   (let ((query-result (query-dig query-string)))
+                     (when query-result
+                       (gnus-message 5 "(DIG): positive blackhole check '%s'" 
+                                     query-result)
+                       (push (list ip server query-result)
+                             matches)))
+                 ;; else, if not using dig.el
+                 (when (query-dns query-string)
+                   (gnus-message 5 "positive blackhole check")
+                   (push (list ip server (query-dns query-string 'TXT))
+                         matches)))))))))
     (when matches
       spam-split-group)))
 \f