aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2023-10-27 15:18:36 +0200
committerMichael Albinus2023-10-27 15:18:36 +0200
commit28c2191df0239c16b4fb9e7242582185175a329f (patch)
tree222ae1c34335f7bcbc0ed4d1e00e1ff4fc04b25a
parentd81c59612f026cc6540b388e144c20a3497e72e1 (diff)
downloademacs-28c2191df0239c16b4fb9e7242582185175a329f.tar.gz
emacs-28c2191df0239c16b4fb9e7242582185175a329f.zip
* lisp/net/tramp.el (tramp-read-id-output): Identifiers can contain "-".
-rw-r--r--lisp/net/tramp.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 7cc9b0c14a2..9cc319bef67 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6231,20 +6231,20 @@ Set connection properties \"{uid,gid,groups}-{integer,string}\"."
6231 (goto-char (point-min)) 6231 (goto-char (point-min))
6232 ;; Read uid. 6232 ;; Read uid.
6233 (when (search-forward-regexp 6233 (when (search-forward-regexp
6234 (rx "uid=" (group (+ digit)) "(" (group (+ (any "_" word))) ")") 6234 (rx "uid=" (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")")
6235 nil 'noerror) 6235 nil 'noerror)
6236 (setq uid-integer (string-to-number (match-string 1)) 6236 (setq uid-integer (string-to-number (match-string 1))
6237 uid-string (match-string 2))) 6237 uid-string (match-string 2)))
6238 ;; Read gid. 6238 ;; Read gid.
6239 (when (search-forward-regexp 6239 (when (search-forward-regexp
6240 (rx "gid=" (group (+ digit)) "(" (group (+ (any "_" word))) ")") 6240 (rx "gid=" (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")")
6241 nil 'noerror) 6241 nil 'noerror)
6242 (setq gid-integer (string-to-number (match-string 1)) 6242 (setq gid-integer (string-to-number (match-string 1))
6243 gid-string (match-string 2))) 6243 gid-string (match-string 2)))
6244 ;; Read groups. 6244 ;; Read groups.
6245 (when (search-forward-regexp (rx "groups=") nil 'noerror) 6245 (when (search-forward-regexp (rx "groups=") nil 'noerror)
6246 (while (looking-at 6246 (while (looking-at
6247 (rx (group (+ digit)) "(" (group (+ (any "_" word))) ")")) 6247 (rx (group (+ digit)) "(" (group (+ (any "_-" alnum))) ")"))
6248 (setq groups-integer (cons (string-to-number (match-string 1)) 6248 (setq groups-integer (cons (string-to-number (match-string 1))
6249 groups-integer) 6249 groups-integer)
6250 groups-string (cons (match-string 2) groups-string)) 6250 groups-string (cons (match-string 2) groups-string))