nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0729fb90c487db021888a8071bbe3c49be16946f..e58b6cc777373685805daa9c6c7b267a2a7e09ac 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nntp.el (nntp-send-authinfo): Work for secure nntp entry in authinfo.
+
 2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * mm-decode.el (mm-shr): Remove "soft hyphens".

diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 98393a617648f8df2d38ac742e14080f7ee10d23..0f60fdd756bb1953e366f00c615772264caacfd0 100644 (file)
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1252,10 +1252,13 @@ If SEND-IF-FORCE, only send authinfo to the server if the
   (let* ((list (netrc-parse nntp-authinfo-file))
         (alist (netrc-machine list nntp-address "nntp"))
          (auth-info
-          (nth 0 (auth-source-search :max 1
-                                     :host (list nntp-address
-                                                 (nnoo-current-server 'nntp))
-                                     :port '("119" "nntp"))))
+          (nth 0 (auth-source-search
+                 :max 1
+                 :host (list nntp-address
+                             (nnoo-current-server 'nntp))
+                 :port (or (cdr (assoc (format "%s" nntp-port-number)
+                                       '(("563" . ("563" "nntps" "snews")))))
+                           '("119" "nntp")))))
          (auth-user (plist-get auth-info :user))
          (auth-force (plist-get auth-info :force))
          (auth-passwd (plist-get auth-info :secret))