Re: Tramp 2.0 -> 2.1 migration woes

[Michael Albinus <michael.albinus@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

"Trent W. Buck" <trentbuck@gmail.com> writes:

> The initial hops are no longer shown in the path, nor on the first
> line of dired buffers.  Already I have been VERY confused because
> a bad tramp-default-proxies-alist resulted in no proxy being used for
>
>     /sudo:root@leek:/etc
>
> ...so that instead of editing leek's /etc as root, I was editing my
> laptop's /etc as root!  Since the path claims that I'm on root@leek, I
> would have made disastrous changes to my local system if I hadn't
> noticed that there was no /etc/ssh/sshd_config (because sshd is not
> installed on my laptop).

The appended patch shall fix it. Could you, please, test?

Best regards, Michael.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1163 bytes --]

*** /home/albinus/src/tramp/lisp/tramp.el.~2.624.~	2008-01-26 15:19:11.000000000 +0100
--- /home/albinus/src/tramp/lisp/tramp.el	2008-01-27 15:43:19.000000000 +0100
***************
*** 6052,6057 ****
--- 6052,6078 ----
  	   "Method `%s' is not supported for multi-hops."
  	   (tramp-file-name-method item)))))
  
+     ;; In case the host name is not used for the remote shell
+     ;; command, the user could be misguided by applying a random
+     ;; hostname.
+     (let* ((v (car target-alist))
+ 	   (method (tramp-file-name-method v))
+ 	   (host (tramp-file-name-host v)))
+       (unless
+ 	  (or
+ 	   ;; There are multi-hops.
+ 	   (cdr target-alist)
+ 	   ;; The host name is used for the remote shell command.
+ 	   (member
+ 	    '("%h") (tramp-get-method-parameter method 'tramp-login-args))
+ 	   ;; The host is local.  We cannot use `tramp-local-host-p'
+ 	   ;; here, because it opens a connection as well.
+ 	   (string-match
+ 	    (concat "^" (regexp-opt (list "localhost" (system-name)) t) "$")
+ 	    host))
+ 	(tramp-error
+ 	 v 'file-error "Wrong hostname `%s' for method `%s'" host method)))
+ 
      ;; Result.
      target-alist))
  

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel