diff options
| author | Michael Albinus | 2025-10-06 16:32:12 +0200 |
|---|---|---|
| committer | Michael Albinus | 2025-10-06 16:32:12 +0200 |
| commit | 96358a044cfe1fbc2da1e000aa97ebbba8b2c9f2 (patch) | |
| tree | c6e1175be211085fdebc5e4d03170dc0cb54c636 | |
| parent | 1434bc97dc9b4bee6b0463c969abe905a3b2ec1f (diff) | |
| download | emacs-96358a044cfe1fbc2da1e000aa97ebbba8b2c9f2.tar.gz emacs-96358a044cfe1fbc2da1e000aa97ebbba8b2c9f2.zip | |
; Fix last change in auth-source.el
* lisp/auth-source.el (auth-source-search-spec): Fix thinko.
(auth-source-secrets-search): Fix call of
`auth-source-secrets-listify-pattern'.
| -rw-r--r-- | lisp/auth-source.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 1cef682af82..402f2617ca8 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el | |||
| @@ -405,12 +405,12 @@ A fallback backend is added to ensure, that at least `read-passwd' is called." | |||
| 405 | (defmacro auth-source-search-spec (spec) | 405 | (defmacro auth-source-search-spec (spec) |
| 406 | "Build a search spec without the ignored keys. | 406 | "Build a search spec without the ignored keys. |
| 407 | If a search key is nil or t (match anything), skip it." | 407 | If a search key is nil or t (match anything), skip it." |
| 408 | `(seq-keep | 408 | `(apply #'append (mapcar |
| 409 | (lambda (k) | 409 | (lambda (k) |
| 410 | (and-let* ((v (plist-get ,spec k)) | 410 | (and-let* ((v (plist-get ,spec k)) |
| 411 | ((not (eq t v))) | 411 | ((not (eq t v))) |
| 412 | ((cons k (auth-source-ensure-strings v)))))) | 412 | ((list k (auth-source-ensure-strings v)))))) |
| 413 | (auth-source-search-keys spec))) | 413 | (auth-source-search-keys ,spec)))) |
| 414 | 414 | ||
| 415 | (defcustom auth-source-ignore-non-existing-file t | 415 | (defcustom auth-source-ignore-non-existing-file t |
| 416 | "If set non-nil, file-based backends are ignored if the file does not exist. | 416 | "If set non-nil, file-based backends are ignored if the file does not exist. |
| @@ -1804,8 +1804,7 @@ authentication tokens: | |||
| 1804 | (items | 1804 | (items |
| 1805 | (cl-loop | 1805 | (cl-loop |
| 1806 | for search-spec in | 1806 | for search-spec in |
| 1807 | (apply #'auth-source-secrets-listify-pattern | 1807 | (auth-source-secrets-listify-pattern (auth-source-search-spec spec)) |
| 1808 | (auth-source-search-spec spec)) | ||
| 1809 | nconc | 1808 | nconc |
| 1810 | (cl-loop for item in (apply #'secrets-search-items coll search-spec) | 1809 | (cl-loop for item in (apply #'secrets-search-items coll search-spec) |
| 1811 | unless (and (stringp label) | 1810 | unless (and (stringp label) |