Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use auth-source in tramp-parse-netrc

Browse source 
* lisp/auth-source.el (auth-source-netrc-parse-all): Autoload.

* lisp/net/tramp.el (tramp-parse-netrc): Don't use netrc-parse,
because it's going to be made obsolete (bug#56976).
This commit is contained in:
Lars Ingebrigtsen 2022-08-04 17:09:46 +02:00
parent 22a2ad13f5
commit 3bc7b5f412
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/auth-source.el
View file

@ -909,6 +909,7 @@ Remove trailing \": \"."
(defun auth-source--aget (alist key)
(cdr (assoc key alist)))
;;;###autoload
(defun auth-source-netrc-parse-all (file)
"Parse FILE and return all entries."
(auth-source-netrc-parse :file file :allow-null t))

3
lisp/net/tramp.el
View file

@ -3342,12 +3342,11 @@ Host is always \"localhost\"."
User may be nil."
;; The declaration is not sufficient at runtime, because netrc.el is
;; not autoloaded.
(autoload 'netrc-parse "netrc")
(mapcar
(lambda (item)
(and (assoc "machine" item)
`(,(cdr (assoc "login" item)) ,(cdr (assoc "machine" item)))))
(netrc-parse filename)))
(auth-source-netrc-parse-all filename)))
(defun tramp-parse-putty (registry-or-dirname)
"Return a list of (user host) tuples allowed to access.