1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-02 20:00:35 -08:00

Fix Tramp (don't merge)

* lisp/net/tramp.el (tramp-read-id-output): Identifiers can contain "-".
This commit is contained in:
Michael Albinus 2023-10-27 15:09:41 +02:00
parent c22eeba827
commit 4193912745

View file

@ -6399,20 +6399,20 @@ Set connection properties \"{uid,gid.groups}-{integer,string}\"."
(goto-char (point-min))
;; Read uid.
(when (re-search-forward
(rx "uid=" (group (+ digit)) "(" (group (+ (any "_" word))) ")")
(rx "uid=" (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")")
nil 'noerror)
(setq uid-integer (string-to-number (match-string 1))
uid-string (match-string 2)))
;; Read gid.
(when (re-search-forward
(rx "gid=" (group (+ digit)) "(" (group (+ (any "_" word))) ")")
(rx "gid=" (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")")
nil 'noerror)
(setq gid-integer (string-to-number (match-string 1))
gid-string (match-string 2)))
;; Read groups.
(when (re-search-forward (rx "groups=") nil 'noerror)
(while (looking-at
(rx (group (+ digit)) "(" (group (+ (any "_" word))) ")"))
(rx (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")"))
(setq groups-integer (cons (string-to-number (match-string 1))
groups-integer)
groups-string (cons (match-string 2) groups-string))