From: Michael Albinus Date: Sun, 10 Nov 2013 08:35:04 +0000 (+0100) Subject: * net/tramp.el (tramp-methods): X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~878 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7072a4e9cbf8c2a38092161a5c5f677348ead636;p=emacs.git * net/tramp.el (tramp-methods): * net/tramp-sh.el (tramp-compute-multi-hops): Revert change of 2013-10-29T02:50:24Z!dancol@dancol.org. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79bb26c7dfb..5d7c0956632 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-11-10 Michael Albinus + + * net/tramp.el (tramp-methods): + * net/tramp-sh.el (tramp-compute-multi-hops): Revert change of + 2013-10-29 (2013-10-29T02:50:24Z!dancol@dancol.org). + 2013-11-09 Andreas Schwab * progmodes/sh-script.el (sh-font-lock-keywords-var): Force diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f8b99dd918e..9b15c3655e0 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4285,10 +4285,6 @@ Gateway hops are already opened." (or ;; There are multi-hops. (cdr target-alist) - ;; This method explicitly has an explicit allowability check. - (let ((checker (tramp-get-method-parameter - method 'tramp-hostname-checker))) - (when checker (funcall checker v host method) t)) ;; The host name is used for the remote shell command. (member '("%h") (tramp-get-method-parameter method 'tramp-login-args)) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 630208a8fbe..42988b0fd69 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -265,15 +265,6 @@ pair of the form (KEY VALUE). The following KEYs are defined: In general, the global default value shall be used, but for some methods, like \"su\" or \"sudo\", a shorter timeout might be desirable. - * `tramp-hostname-checker' - This is a function that tramp calls while setting - up a connection. It is called with three arguments: - the target, the host, and the method description. If - the hostname is unacceptable, this function should signal - using `tramp-error'. If a method does not provide - a value here, then Tramp looks at whether the method's - login program uses a \"%h\" parameter. If not, then Tramp - requires that the given hostname match `tramp-local-host-regexp'. What does all this mean? Well, you should specify `tramp-login-program' for all methods; this program is used to log in to the remote site. Then,