(imap-authenticator-alist): Fix typo.

(imap-gssapi-open): Copy krb4 fixes for modern imtest's, thanks to
Jonas Oberg for debugging.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4cc7be1..ec1870e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-11  Simon Josefsson  <simon@josefsson.org>
+
+       * imap.el (imap-authenticator-alist): Fix typo.
+       (imap-gssapi-open): Copy krb4 fixes for modern imtest's, thanks to
+       Jonas Oberg for debugging.
+
 2000-08-11  Simon Josefsson  <simon@josefsson.org>
 
        * gnus-async.el (gnus-asynchronous): Disable by default.

diff --git a/lisp/imap.el b/lisp/imap.el
index d0d5902..6016b84 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -246,7 +246,7 @@ stream.")
   "Priority of authenticators to consider when authenticating to server.")
 
 (defvar imap-authenticator-alist 
-  '((gssapi     imap-gssapi-auth-p    imap-gssapia-auth)
+  '((gssapi     imap-gssapi-auth-p    imap-gssapi-auth)
     (kerberos4  imap-kerberos4-auth-p imap-kerberos4-auth)
     (cram-md5   imap-cram-md5-p       imap-cram-md5-auth)
     (login      imap-login-p          imap-login-auth)
@@ -513,6 +513,10 @@ If ARGS, PROMPT is used as an argument to `format'."
            (setq imap-client-eol "\n")
            (while (and (memq (process-status process) '(open run))
                        (goto-char (point-min))
+                        ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
+                       (or (while (looking-at "^C:")
+                             (forward-line))
+                           t)
                        ;; cyrus 1.6 imtest print "S: " before server greeting
                        (or (not (looking-at "S: "))
                            (forward-char 3)