[Emacs-diffs] /srv/bzr/emacs/trunk r104277: nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication with auth-source.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104277
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-18 14:17:34 +0000
message:
  nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication 
with auth-source.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nntp.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-05-17 02:32:50 +0000
+++ b/lisp/gnus/ChangeLog       2011-05-18 14:17:34 +0000
@@ -1,3 +1,8 @@
+2011-05-18  Teodor Zlatanov  <address@hidden>
+
+       * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP
+       authentication with auth-source.
+
 2011-05-17  Glenn Morris  <address@hidden>
 
        * gnus-group.el (gnus-import-other-newsrc-file):

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-05-16 14:46:30 +0000
+++ b/lisp/gnus/nntp.el 2011-05-18 14:17:34 +0000
@@ -1227,17 +1227,20 @@
   (require 'netrc)
   (let* ((list (netrc-parse nntp-authinfo-file))
         (alist (netrc-machine list nntp-address "nntp"))
-        (force (or (netrc-get alist "force") nntp-authinfo-force))
          (auth-info
           (nth 0 (auth-source-search :max 1
                                      ;; TODO: allow the virtual server name too
                                      :host nntp-address
                                      :port '("119" "nntp"))))
          (auth-user (plist-get auth-info :user))
+         (auth-force (plist-get auth-info :force))
          (auth-passwd (plist-get auth-info :secret))
          (auth-passwd (if (functionp auth-passwd)
                           (funcall auth-passwd)
                         auth-passwd))
+        (force (or (netrc-get alist "force")
+                    nntp-authinfo-force
+                    auth-force))
         (user (or
                ;; this is preferred to netrc-*
                auth-user