nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication with...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 068093159e3a332b6bf74c6a9a1b34514870da6d..bb70816f298407de3be47b970115dd089c7b4b9c 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP
+       authentication with auth-source.
+
 2011-05-17  Glenn Morris  <rgm@gnu.org>
 
        * gnus-group.el (gnus-import-other-newsrc-file):

diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index cdd12abbc061a72015eebfb8c7fd1f4a8d9ff07e..a8ffc6576cafef4b094f2c77bee43d93b57b1e89 100644 (file)
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1227,17 +1227,20 @@ If SEND-IF-FORCE, only send authinfo to the server if the
   (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