[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master d92c11845a: Add new function auth-source-netrc-parse-all
From: |
Lars Ingebrigtsen |
Subject: |
master d92c11845a: Add new function auth-source-netrc-parse-all |
Date: |
Thu, 4 Aug 2022 10:50:20 -0400 (EDT) |
branch: master
commit d92c11845a28f017d86471b523a3270e3345c707
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Add new function auth-source-netrc-parse-all
* lisp/auth-source.el (auth-source-netrc-parse-all): New function
(bug#56976).
(auth-source-netrc-parse): Partially revert behaviour in previous
change -- require :allow-null to match.
---
lisp/auth-source.el | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 55dbaab3ee..48f9517683 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -909,10 +909,16 @@ Remove trailing \": \"."
(defun auth-source--aget (alist key)
(cdr (assoc key alist)))
+(defun auth-source-netrc-parse-all (file)
+ "Parse FILE and return all entries."
+ (auth-source-netrc-parse :file file :allow-null t))
+
;; (auth-source-netrc-parse :file "~/.authinfo.gpg")
(cl-defun auth-source-netrc-parse (&key file max host user port require
- &allow-other-keys)
- "Parse FILE and return a list of all entries in the file.
+ allow-null &allow-other-keys)
+ "Parse FILE and return a list of matching entries in the file.
+If ALLOW-NULL, allow nil values of HOST, USER and PORT to match.
+
Note that the MAX parameter is used so we can exit the parse early."
(if (listp file)
;; We got already parsed contents; just return it.
@@ -928,7 +934,7 @@ Note that the MAX parameter is used so we can exit the
parse early."
(check (lambda (alist)
(and alist
(or
- (null host)
+ (and allow-null (null host))
(auth-source-search-collection
host
(or
@@ -936,7 +942,7 @@ Note that the MAX parameter is used so we can exit the
parse early."
(auth-source--aget alist "host")
t)))
(or
- (null user)
+ (and allow-null (null user))
(auth-source-search-collection
user
(or
@@ -945,7 +951,7 @@ Note that the MAX parameter is used so we can exit the
parse early."
(auth-source--aget alist "user")
t)))
(or
- (null port)
+ (and allow-null (null port))
(auth-source-search-collection
port
(or
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master d92c11845a: Add new function auth-source-netrc-parse-all,
Lars Ingebrigtsen <=