diff options
| author | Michael Albinus | 2018-03-29 15:59:11 +0200 |
|---|---|---|
| committer | Michael Albinus | 2018-03-29 15:59:11 +0200 |
| commit | b9340aad7961c57fbd458d52e813b71f09aaa45f (patch) | |
| tree | e1ea831aa4368db4869712f11d8a1cf89e2d1b43 /doc/misc | |
| parent | 9ad3560db6b67777bc8f9b370e053b6a19a7501f (diff) | |
| download | emacs-b9340aad7961c57fbd458d52e813b71f09aaa45f.tar.gz emacs-b9340aad7961c57fbd458d52e813b71f09aaa45f.zip | |
Fix Bug#30946
* doc/misc/tramp.texi (Multi-hops): Mention host name checks.
* lisp/net/tramp.el (tramp-set-syntax, tramp-dissect-file-name)
(tramp-debug-message, tramp-handle-shell-command):
* lisp/net/tramp-adb.el (tramp-adb-handle-shell-command):
* lisp/net/tramp-archive.el (tramp-archive-file-name-handler)
(tramp-archive-dissect-file-name):
* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler): Adapt callees.
* lisp/net/tramp-compat.el (tramp-compat-user-error): Move defsubst ---
* lisp/net/tramp-sh.el (tramp-compute-multi-hops): Check for proper
host names in multi-hop. (Bug#30946)
* lisp/net/tramp.el (tramp-user-error): ... here. Make it a defun.
* test/lisp/net/tramp-tests.el (tramp-test03-file-name-host-rules):
New test.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/tramp.texi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 31439043435..f0ea073ed09 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi | |||
| @@ -1408,8 +1408,10 @@ Opening @file{@trampfn{sudo,randomhost.your.domain,}} first connects | |||
| 1408 | to @samp{randomhost.your.domain} via @code{ssh} under your account | 1408 | to @samp{randomhost.your.domain} via @code{ssh} under your account |
| 1409 | name, and then performs @code{sudo -u root} on that host. | 1409 | name, and then performs @code{sudo -u root} on that host. |
| 1410 | 1410 | ||
| 1411 | It is key for the sudo method in the above example to be applied on | 1411 | It is key for the @option{sudo} method in the above example to be |
| 1412 | the host after reaching it and not on the local host. | 1412 | applied on the host after reaching it and not on the local host. |
| 1413 | @value{tramp} checks therefore, that the host name for such hops | ||
| 1414 | matches the host name of the previous hop. | ||
| 1413 | 1415 | ||
| 1414 | @var{host}, @var{user} and @var{proxy} can also take Lisp forms. These | 1416 | @var{host}, @var{user} and @var{proxy} can also take Lisp forms. These |
| 1415 | forms when evaluated must return either a string or @code{nil}. | 1417 | forms when evaluated must return either a string or @code{nil}. |