summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-11-14 16:19:39 +0100
committerMichael Albinus <michael.albinus@gmx.de>2018-11-14 16:19:39 +0100
commit3287a7c048c0c2efc9da59ecd4a12f56f42bb044 (patch)
treecb57ffb0f32a9090ed9753ff1675bb41014d0606
parentacee0a8f2052abb9aacb8d782afcc5cd64363f04 (diff)
downloademacs-3287a7c048c0c2efc9da59ecd4a12f56f42bb044.tar.gz
Fix Bug#33364
* lisp/net/tramp.el (tramp-parse-sconfig-group): Support also "Host host1 host2 ..." syntax. (Bug#33364)
-rw-r--r--lisp/net/tramp.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 98ec8415c74..e9f5f7d4347 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2739,7 +2739,9 @@ User is always nil."
"Return a (user host) tuple allowed to access.
User is always nil."
(tramp-parse-group
- (concat "^[ \t]*Host[ \t]+" "\\(" tramp-host-regexp "\\)") 1 ","))
+ (concat "\\(?:^[ \t]*Host\\)" "\\|" "\\(?:^.+\\)"
+ "\\|" "\\(" tramp-host-regexp "\\)")
+ 1 "[ \t]+"))
;; Generic function.
(defun tramp-parse-shostkeys-sknownhosts (dirname regexp)