* 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 79bb26c7dfb31cbc84df6978e0d9baa9a6e5b486..5d7c0956632b40b16dec47a523a965578237a146 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-10  Michael Albinus  <michael.albinus@gmx.de>
+
+       * 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  <schwab@linux-m68k.org>
 
        * 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 f8b99dd918eae73a33ca6e5a7710bf0661240401..9b15c3655e0a8e60866a580808c567b53ac72341 100644 (file)
--- 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 630208a8fbe96a080119a4b3b4d23fc5a415a512..42988b0fd6986242d7eefc18f33683e6249c3477 100644 (file)
--- 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,