diff options
| author | Miles Bader <miles@gnu.org> | 2009-02-05 02:34:34 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2009-02-05 02:34:34 +0000 |
| commit | 3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22 (patch) | |
| tree | c2ca87dc1f8bb06d2b0608ef939d51f0b28e5d2e /lisp/gnus/nntp.el | |
| parent | a9e2203dea54ba2d777e0df0415f65bb105272f1 (diff) | |
| download | emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.tar.gz emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.tar.bz2 emacs-3b36c17e9d67d74a8bc50e7a53a23da7d5f94e22.zip | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1537
Diffstat (limited to 'lisp/gnus/nntp.el')
| -rw-r--r-- | lisp/gnus/nntp.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 6e9978d4c32..8a6c9a2d78a 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el @@ -1179,14 +1179,18 @@ 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")) (force (or (netrc-get alist "force") nntp-authinfo-force)) + (auth-info + (auth-source-user-or-password '("login" "password") nntp-address "nntp")) + (auth-user (nth 0 auth-info)) + (auth-passwd (nth 1 auth-info)) (user (or ;; this is preferred to netrc-* - (auth-source-user-or-password "login" nntp-address "nntp") + auth-user (netrc-get alist "login") nntp-authinfo-user)) (passwd (or ;; this is preferred to netrc-* - (auth-source-user-or-password "password" nntp-address "nntp") + auth-passwd (netrc-get alist "password")))) (when (or (not send-if-force) force) |