From a2967a1804e348afd1e419437e4c99a31ce9bb64 Mon Sep 17 00:00:00 2001 From: Teodor Zlatanov Date: Fri, 9 May 2008 21:21:25 +0000 Subject: [PATCH] * nntp.el: Autoload `auth-source-user-or-password'. (nntp-send-authinfo): Use it. * nnimap.el: Autoload `auth-source-user-or-password'. (nnimap-open-connection): Use it. * auth-source.el: Import gnus-util for the gnus-message function. (auth-source-user-or-password): Use it. --- lisp/ChangeLog | 10 +++++++++- lisp/auth-source.el | 12 +++++++++++- lisp/nnimap.el | 39 +++++++++++++++++++++++---------------- lisp/nntp.el | 14 ++++++++++++-- 4 files changed, 55 insertions(+), 20 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 53fc352fd..effbde89b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,14 @@ 2008-05-09 Teodor Zlatanov - * auth-source.el: Added docs on using with url-auth. + * nntp.el: Autoload `auth-source-user-or-password'. + (nntp-send-authinfo): Use it. + + * nnimap.el: Autoload `auth-source-user-or-password'. + (nnimap-open-connection): Use it. + + * auth-source.el: Added docs on using with url-auth. Import gnus-util + for the gnus-message function. + (auth-source-user-or-password): Use it. 2008-05-07 Teodor Zlatanov diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 863928b59..6c53da191 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -51,6 +51,8 @@ ;;; Code: +(require 'gnus-util) + (eval-when-compile (require 'cl)) (eval-when-compile (require 'netrc)) @@ -145,7 +147,9 @@ Returns fallback choices (where PROTOCOL or HOST are nil) with FALLBACK t." (defun auth-source-user-or-password (mode host protocol) "Find user or password (from the string MODE) matching HOST and PROTOCOL." -;;; (debug mode host protocol) + (gnus-message 9 + "auth-source-user-or-password: get %s for %s (%s)" + mode host protocol) (let (found) (dolist (choice (auth-source-pick host protocol)) (setq found (netrc-machine-user-or-password @@ -155,6 +159,12 @@ Returns fallback choices (where PROTOCOL or HOST are nil) with FALLBACK t." (list (format "%s" protocol)) (auth-source-protocol-defaults protocol))) (when found + (gnus-message 9 + "auth-source-user-or-password: found %s=%s for %s (%s)" + mode + ;; don't show the password + (if (equal mode "password") "SECRET" found) + host protocol) (return found))))) (defun auth-source-protocol-defaults (protocol) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 45f794626..3dbe025d6 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -73,6 +73,9 @@ (eval-when-compile (require 'cl)) +(eval-and-compile + (autoload 'auth-source-user-or-password "auth-source")) + (nnoo-declare nnimap) (defconst nnimap-version "nnimap 1.0") @@ -798,22 +801,26 @@ If EXAMINE is non-nil the group is selected read-only." (port (if nnimap-server-port (int-to-string nnimap-server-port) "imap")) - (user (netrc-machine-user-or-password - "login" - list - (list server - (or nnimap-server-address - nnimap-address)) - (list port) - (list "imap" "imaps" "143" "993"))) - (passwd (netrc-machine-user-or-password - "password" - list - (list server - (or nnimap-server-address - nnimap-address)) - (list port) - (list "imap" "imaps" "143" "993")))) + (user (or + (auth-source-user-or-password "login" server port) ; this is preferred to netrc-* + (netrc-machine-user-or-password + "login" + list + (list server + (or nnimap-server-address + nnimap-address)) + (list port) + (list "imap" "imaps" "143" "993")))) + (passwd (or + (auth-source-user-or-password "login" server port) ; this is preferred to netrc-* + (netrc-machine-user-or-password + "password" + list + (list server + (or nnimap-server-address + nnimap-address)) + (list port) + (list "imap" "imaps" "143" "993"))))) (if (imap-authenticate user passwd nnimap-server-buffer) (prog2 (setq nnimap-server-buffer-alist diff --git a/lisp/nntp.el b/lisp/nntp.el index f43d1a1aa..fb35609bd 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -38,6 +38,9 @@ (eval-when-compile (require 'cl)) +(eval-and-compile + (autoload 'auth-source-user-or-password "auth-source")) + (defgroup nntp nil "NNTP access for Gnus." :group 'gnus) @@ -1179,8 +1182,15 @@ 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)) - (user (or (netrc-get alist "login") nntp-authinfo-user)) - (passwd (netrc-get alist "password"))) + (user (or + ;; this is preferred to netrc-* + (auth-source-user-or-password "login" nntp-address "nntp") + (netrc-get alist "login") + nntp-authinfo-user)) + (passwd (or + ;; this is preferred to netrc-* + (auth-source-user-or-password "password" nntp-address "nntp") + (netrc-get alist "password")))) (when (or (not send-if-force) force) (unless user -- 2.25.1