Mercurial > emacs
changeset 110209:bafb89eacad6
nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the .authinfo if we're using ssl connection.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 05 Sep 2010 23:27:15 +0000 |
| parents | 7e0143c80273 |
| children | 3d982e5c5f58 |
| files | lisp/gnus/ChangeLog lisp/gnus/nnimap.el |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sun Sep 05 23:20:25 2010 +0000 +++ b/lisp/gnus/ChangeLog Sun Sep 05 23:27:15 2010 +0000 @@ -1,5 +1,8 @@ 2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org> + * nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the + .authinfo if we're using ssl connection. + * nnvirtual.el (nnvirtual-create-mapping): Use the active info we already have if we're in a main Gnus `g' run.
--- a/lisp/gnus/nnimap.el Sun Sep 05 23:20:25 2010 +0000 +++ b/lisp/gnus/nnimap.el Sun Sep 05 23:27:15 2010 +0000 @@ -832,9 +832,13 @@ (let* ((list (progn (gnus-message 7 "Parsing authinfo file `%s'." nnimap-authinfo-file) (netrc-parse nnimap-authinfo-file))) - (port (if nnimap-server-port - (int-to-string nnimap-server-port) - "imap")) + (port (cond + (nnimap-server-port + (int-to-string nnimap-server-port)) + ((eq nnimap-stream 'ssl) + "imaps") + (t + "imap"))) (auth-info (auth-source-user-or-password '("login" "password") server port)) (auth-user (nth 0 auth-info))