Synch to No Gnus 200510231215.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90e559a..dcd219d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-23  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-gssapi-program): Align command line parameters
+       with latest GNU SASL.
+       (imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL.
+
 2005-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnslashdot.el (nnslashdot-retrieve-headers-1): Update to new

diff --git a/lisp/imap.el b/lisp/imap.el
index f26590f..337c8cb 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -176,8 +176,7 @@ the list is tried until a successful connection is made."
   :type '(repeat string))
 
 (defcustom imap-gssapi-program (list
-                               (concat "gsasl --client --connect %s:%p "
-                                       "--imap --application-data "
+                               (concat "gsasl %s %p "
                                        "--mechanism GSSAPI "
                                        "--authentication-id %l")
                                "imtest -m gssapi -u %l -p %p %s")
@@ -596,6 +595,10 @@ sure of changing the value of `foo'."
                        (or (not (looking-at "S: "))
                            (forward-char 3)
                            t)
+                       ;; GNU SASL may print 'Trying ...' first.
+                       (or (not (looking-at "Trying "))
+                           (forward-line)
+                           t)
                        (not (and (imap-parse-greeting)
                                  ;; success in imtest 1.6:
                                  (re-search-forward