Commit fb7e9e05 authored by Ted Zlatanov's avatar Ted Zlatanov Committed by Katsumi Yamaoka
Browse files

nntp.el (nntp-send-authinfo): Query `auth-source-search' with the logical...

nntp.el (nntp-send-authinfo): Query `auth-source-search' with the logical server name in addition to the actual machine address.
auth-source.el (auth-source-user-and-password): Add convenience wrapper to search by just host and optionally user.
parent 1e2c5d95
2012-01-10 Teodor Zlatanov <tzz@lifelogs.com>
* nntp.el (nntp-send-authinfo): Query `auth-source-search' with the
logical server name in addition to the actual machine address.
* auth-source.el (auth-source-user-and-password): Add convenience
wrapper to search by just host and optionally user.
2012-01-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
 
* shr.el (shr-visit-file): Move point to the beginning of the buffer
......
......@@ -1781,6 +1781,26 @@ MODE can be \"login\" or \"password\"."
found))
(defun auth-source-user-and-password (host &optional user)
(let* ((auth-info (car
(if user
(auth-source-search
:host host
:user "yourusername"
:max 1
:require '(:user :secret)
:create nil)
(auth-source-search
:host host
:max 1
:require '(:user :secret)
:create nil))))
(user (plist-get auth-info :user))
(password (plist-get auth-info :secret)))
(when (functionp password)
(setq password (funcall password)))
(list user password auth-info)))
(provide 'auth-source)
;;; auth-source.el ends here
......@@ -1249,8 +1249,8 @@ If SEND-IF-FORCE, only send authinfo to the server if the
(alist (netrc-machine list nntp-address "nntp"))
(auth-info
(nth 0 (auth-source-search :max 1
;; TODO: allow the virtual server name too
:host nntp-address
:host (list nntp-address
(nnoo-current-server 'nntp))
:port '("119" "nntp"))))
(auth-user (plist-get auth-info :user))
(auth-force (plist-get auth-info :force))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment