Synch to Gnus 200311170555.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e85ee42..6cf27d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-17  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-gssapi-auth-p): Don't check capability (some
+       servers remove AUTH=GSSAPI from capability response returned after
+       successful authentication).
+
 2003-11-16  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.el (gnus-getenv-nntpserver): Fix regexp and simplify.

diff --git a/lisp/imap.el b/lisp/imap.el
index ab46b50..0c7f5dc 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -828,8 +828,7 @@ Returns t if login was successful, nil otherwise."
       ret)))
 
 (defun imap-gssapi-auth-p (buffer)
-  (and (imap-capability 'AUTH=GSSAPI buffer)
-       (eq imap-stream 'gssapi)))
+  (eq imap-stream 'gssapi))
 
 (defun imap-gssapi-auth (buffer)
   (message "imap: Authenticating using GSSAPI...%s"