Synch to No Gnus 200511161523.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7fa0e0..15b6571 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Boris Samorodov <bsam@ipt.ru>  (tiny patch)
+
+       * imap.el (imap-kerberos4-open): Ignore SSL stuff.
+
 2005-11-13  Kevin Greiner  <kevin.greiner@compsol.cc>
 
        * gnus-agent.el (gnus-agent-read-local): Trivial fix to format of

diff --git a/lisp/imap.el b/lisp/imap.el
index 337c8cb..dc352a3 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -587,6 +587,13 @@ sure of changing the value of `foo'."
            (while (and (memq (process-status process) '(open run))
                        (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                        (goto-char (point-min))
+                       ;; Athena IMTEST can output SSL verify errors
+                       (or (while (looking-at "^verify error:num=")
+                             (forward-line))
+                           t)
+                       (or (while (looking-at "^TLS connection established")
+                             (forward-line))
+                           t)
                        ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
                        (or (while (looking-at "^C:")
                              (forward-line))