From e7d2a85747a6d6c8079f2c544091fb94a312efb8 Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Wed, 18 May 2011 05:29:27 -0500 Subject: [PATCH] * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP authentication with auth-source. --- lisp/ChangeLog | 5 +++++ lisp/nntp.el | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a8d641ea2..7d6dffa39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-05-18 Teodor Zlatanov + + * nntp.el (nntp-send-authinfo): Use the "force" token for NNTP + authentication with auth-source. + 2011-05-17 Glenn Morris * gnus-group.el (gnus-import-other-newsrc-file): diff --git a/lisp/nntp.el b/lisp/nntp.el index cdd12abbc..a8ffc6576 100644 --- a/lisp/nntp.el +++ b/lisp/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 -- 2.34.1