mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
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.
This commit is contained in:
parent
1e2c5d95f6
commit
fb7e9e0539
@ -1,3 +1,11 @@
|
||||
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))
|
||||
|
Loading…
Reference in New Issue
Block a user