nnimap.el (nnimap-open-connection): Look for the "imaps" entry in the .authinfo if...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cc489021f64241bd7f80e06c84495ea5ca999450..979734107aaf9a240aea684e0827cb4ddb06be68 100644 (file)
--- 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 73242fbf325a9a481eb824909ecf65ea90489cd1..3d415e71a2a79b5357e9d7fa8ae7f68851a34fa2 100644 (file)
--- 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))