Mercurial > emacs

comparison lisp/gnus/imap.el @ 90261:7beb78bc1f8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 616-696) - Add lisp/mh-e/.arch-inventory - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords. - lisp/gnus/ChangeLog: Remove duplicate entry * gnus--rel--5.10 (patch 147-181) - Update from CVS - Merge from emacs--cvs-trunk--0 - Update from CVS: lisp/mml.el (mml-preview): Doc fix. - Update from CVS: texi/message.texi: Fix default values. - Update from CVS: texi/gnus.texi (RSS): Addition.
author Miles Bader <miles@gnu.org>
date Mon, 16 Jan 2006 08:37:27 +0000
parents 2d92f5c9d6ae 28264c86d408
children c5406394f567
comparison
equal deleted inserted replaced
90260:0ca0d9181b5e 90261:7beb78bc1f8e
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
590 (setq imap-client-eol "\n" 589 (setq imap-client-eol "\n"
591 imap-calculate-literal-size-first t) 590 imap-calculate-literal-size-first t)
592 (while (and (memq (process-status process) '(open run)) 591 (while (and (memq (process-status process) '(open run))
593 (set-buffer buffer) ;; XXX "blue moon" nntp.el bug 592 (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
594 (goto-char (point-min)) 593 (goto-char (point-min))
594 ;; Athena IMTEST can output SSL verify errors
595 (or (while (looking-at "^verify error:num=")
596 (forward-line))
597 t)
598 (or (while (looking-at "^TLS connection established")
599 (forward-line))
600 t)
595 ;; cyrus 1.6.x (13? < x <= 22) queries capabilities 601 ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
596 (or (while (looking-at "^C:") 602 (or (while (looking-at "^C:")
597 (forward-line)) 603 (forward-line))
598 t) 604 t)
599 ;; cyrus 1.6 imtest print "S: " before server greeting 605 ;; cyrus 1.6 imtest print "S: " before server greeting
600 (or (not (looking-at "S: ")) 606 (or (not (looking-at "S: "))
601 (forward-char 3) 607 (forward-char 3)
608 t)
609 ;; GNU SASL may print 'Trying ...' first.
610 (or (not (looking-at "Trying "))
611 (forward-line)
602 t) 612 t)
603 (not (and (imap-parse-greeting) 613 (not (and (imap-parse-greeting)
604 ;; success in imtest 1.6: 614 ;; success in imtest 1.6:
605 (re-search-forward 615 (re-search-forward
606 (concat "^\\(\\(Authenticat.*\\)\\|\\(" 616 (concat "^\\(\\(Authenticat.*\\)\\|\\("
1033 (message 1043 (message
1034 "imap: Reconnecting with stream `%s'...failed" 1044 "imap: Reconnecting with stream `%s'...failed"
1035 stream)) 1045 stream))
1036 ;; We're done, kill the first connection 1046 ;; We're done, kill the first connection
1037 (imap-close buffer) 1047 (imap-close buffer)
1038 (kill-buffer buffer) 1048 (let ((name (if (stringp buffer)
1039 (rename-buffer buffer) 1049 buffer
1050 (buffer-name buffer))))
1051 (kill-buffer buffer)
1052 (rename-buffer name))
1040 (message "imap: Reconnecting with stream `%s'...done" 1053 (message "imap: Reconnecting with stream `%s'...done"
1041 stream) 1054 stream)
1042 (setq imap-stream stream) 1055 (setq imap-stream stream)
1043 (setq imap-capability nil) 1056 (setq imap-capability nil)
1044 (setq streams nil))) 1057 (setq streams nil)))