nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the .authinfo if we're using ssl connection.

2 files changed, 10 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cc489021f64..979734107aa 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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.
 
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 73242fbf325..3d415e71a2a 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -832,9 +832,13 @@ If EXAMINE is non-nil the group is selected read-only."
     (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))