procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lisp/auth-source.el
View file

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