sergiodj/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-07-18 22:45:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge from origin/emacs-29

Browse source 
ce85d3811d Fix bug#49289 also for other auth-source backends
This commit is contained in:
Eli Zaretskii 2024-06-22 08:23:18 -04:00
parent 150e2b979c ce85d3811d
commit 2f39a4b28a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/auth-source.el
View file

@ -869,9 +869,9 @@ while \(:host t) would find all host entries."
(defun auth-info-password (auth-info)
"Return the :secret password from the AUTH-INFO."
(let ((secret (plist-get auth-info :secret)))
(while (functionp secret)
(setq secret (funcall secret)))
secret))
(if (functionp secret)
(funcall secret)
secret)))
(defun auth-source-pick-first-password (&rest spec)
"Pick the first secret found by applying `auth-source-search' to SPEC."
@ -1692,7 +1692,7 @@ authentication tokens:
items))
(cl-defun auth-source-secrets-create (&rest spec
&key backend host port create
&key backend host port create user
&allow-other-keys)
(let* ((base-required '(host user port secret label))
;; we know (because of an assertion in auth-source-search) that the
@ -1700,6 +1700,7 @@ authentication tokens:
(create-extra (if (eq t create) nil create))
(current-data (car (auth-source-search :max 1
:host host
:user user
:port port)))
(required (append base-required create-extra))
(collection (oref backend source))
@ -2162,7 +2163,7 @@ entries for git.gnus.org:
items))
(cl-defun auth-source-plstore-create (&rest spec
&key backend host port create
&key backend host port create user
&allow-other-keys)
(let* ((base-required '(host user port secret))
(base-secret '(secret))
@ -2172,9 +2173,11 @@ entries for git.gnus.org:
(create-extra-secret (plist-get create :encrypted))
(create-extra (if (eq t create) nil
(or (append (plist-get create :unencrypted)
create-extra-secret) create)))
create-extra-secret)
create)))
(current-data (car (auth-source-search :max 1
:host host
:user user
:port port)))
(required (append base-required create-extra))
(required-secret (append base-secret create-extra-secret))