summaryrefslogtreecommitdiff
path: root/lisp/gnus/imap.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus/imap.el')
-rw-r--r--lisp/gnus/imap.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index 062f1be4c94..b66d9eded8a 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -182,8 +182,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")
@@ -600,6 +599,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