Mercurial > emacs
comparison lisp/gnus/imap.el @ 66454:9082bf778ad8
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 147-148)
- Update from CVS
2005-10-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-score.el (gnus-default-adaptive-score-alist): Set defaults
depending on gnus-score-decay-constant.
2005-10-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/nnslashdot.el (nnslashdot-request-article)
(nnslashdot-retrieve-headers-1): Update to new HTML.
2005-10-23 Simon Josefsson <jas@extundo.com>
* lisp/gnus/imap.el (imap-gssapi-program): Align command line parameters
with latest GNU SASL.
(imap-gssapi-open): Ignore 'Trying ...' messages from GNU SASL.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 25 Oct 2005 23:34:40 +0000 |
parents | fafd692d1e40 |
children | 68bb9e8a5390 |
comparison
equal
deleted
inserted
replaced
66453:ce840b1d13ad | 66454:9082bf778ad8 |
---|---|
180 the list is tried until a successful connection is made." | 180 the list is tried until a successful connection is made." |
181 :group 'imap | 181 :group 'imap |
182 :type '(repeat string)) | 182 :type '(repeat string)) |
183 | 183 |
184 (defcustom imap-gssapi-program (list | 184 (defcustom imap-gssapi-program (list |
185 (concat "gsasl --client --connect %s:%p " | 185 (concat "gsasl %s %p " |
186 "--imap --application-data " | |
187 "--mechanism GSSAPI " | 186 "--mechanism GSSAPI " |
188 "--authentication-id %l") | 187 "--authentication-id %l") |
189 "imtest -m gssapi -u %l -p %p %s") | 188 "imtest -m gssapi -u %l -p %p %s") |
190 "List of strings containing commands for GSSAPI (krb5) authentication. | 189 "List of strings containing commands for GSSAPI (krb5) authentication. |
191 %s is replaced with server hostname, %p with port to connect to, and | 190 %s is replaced with server hostname, %p with port to connect to, and |
597 (forward-line)) | 596 (forward-line)) |
598 t) | 597 t) |
599 ;; cyrus 1.6 imtest print "S: " before server greeting | 598 ;; cyrus 1.6 imtest print "S: " before server greeting |
600 (or (not (looking-at "S: ")) | 599 (or (not (looking-at "S: ")) |
601 (forward-char 3) | 600 (forward-char 3) |
601 t) | |
602 ;; GNU SASL may print 'Trying ...' first. | |
603 (or (not (looking-at "Trying ")) | |
604 (forward-line) | |
602 t) | 605 t) |
603 (not (and (imap-parse-greeting) | 606 (not (and (imap-parse-greeting) |
604 ;; success in imtest 1.6: | 607 ;; success in imtest 1.6: |
605 (re-search-forward | 608 (re-search-forward |
606 (concat "^\\(\\(Authenticat.*\\)\\|\\(" | 609 (concat "^\\(\\(Authenticat.*\\)\\|\\(" |