diff options
| author | Michael Albinus | 2018-11-14 16:19:39 +0100 |
|---|---|---|
| committer | Michael Albinus | 2018-11-14 16:19:39 +0100 |
| commit | 3287a7c048c0c2efc9da59ecd4a12f56f42bb044 (patch) | |
| tree | cb57ffb0f32a9090ed9753ff1675bb41014d0606 | |
| parent | acee0a8f2052abb9aacb8d782afcc5cd64363f04 (diff) | |
| download | emacs-3287a7c048c0c2efc9da59ecd4a12f56f42bb044.tar.gz emacs-3287a7c048c0c2efc9da59ecd4a12f56f42bb044.zip | |
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.el | 4 |
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." | |||
| 2739 | "Return a (user host) tuple allowed to access. | 2739 | "Return a (user host) tuple allowed to access. |
| 2740 | User is always nil." | 2740 | User is always nil." |
| 2741 | (tramp-parse-group | 2741 | (tramp-parse-group |
| 2742 | (concat "^[ \t]*Host[ \t]+" "\\(" tramp-host-regexp "\\)") 1 ",")) | 2742 | (concat "\\(?:^[ \t]*Host\\)" "\\|" "\\(?:^.+\\)" |
| 2743 | "\\|" "\\(" tramp-host-regexp "\\)") | ||
| 2744 | 1 "[ \t]+")) | ||
| 2743 | 2745 | ||
| 2744 | ;; Generic function. | 2746 | ;; Generic function. |
| 2745 | (defun tramp-parse-shostkeys-sknownhosts (dirname regexp) | 2747 | (defun tramp-parse-shostkeys-sknownhosts (dirname regexp) |