1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-11 16:40:45 -08:00

Allow auth-source-netrc-parse to return all lines

* lisp/auth-source.el (auth-source-netrc-parse): If host/user/port
is nil, don't require those to match.
This commit is contained in:
Lars Ingebrigtsen 2022-08-04 16:09:48 +02:00
parent 0116c660c2
commit 262f57842a

View file

@ -927,25 +927,31 @@ Note that the MAX parameter is used so we can exit the parse early."
(cached-secrets (plist-get cached :secret)) (cached-secrets (plist-get cached :secret))
(check (lambda (alist) (check (lambda (alist)
(and alist (and alist
(or
(null host)
(auth-source-search-collection (auth-source-search-collection
host host
(or (or
(auth-source--aget alist "machine") (auth-source--aget alist "machine")
(auth-source--aget alist "host") (auth-source--aget alist "host")
t)) t)))
(or
(null user)
(auth-source-search-collection (auth-source-search-collection
user user
(or (or
(auth-source--aget alist "login") (auth-source--aget alist "login")
(auth-source--aget alist "account") (auth-source--aget alist "account")
(auth-source--aget alist "user") (auth-source--aget alist "user")
t)) t)))
(or
(null port)
(auth-source-search-collection (auth-source-search-collection
port port
(or (or
(auth-source--aget alist "port") (auth-source--aget alist "port")
(auth-source--aget alist "protocol") (auth-source--aget alist "protocol")
t)) t)))
(or (or
;; the required list of keys is nil, or ;; the required list of keys is nil, or
(null require) (null require)