[Emacs-diffs] trunk r115053: * net/tramp.el (tramp-methods):

[Michael Albinus]

------------------------------------------------------------
revno: 115053
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2013-11-10 09:35:04 +0100
message:
  * net/tramp.el (tramp-methods):
  * net/tramp-sh.el (tramp-compute-multi-hops): Revert change of
  2013-10-29 (r114834).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-09 10:49:42 +0000
+++ b/lisp/ChangeLog    2013-11-10 08:35:04 +0000
@@ -1,3 +1,9 @@
+2013-11-10  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-methods):
+       * net/tramp-sh.el (tramp-compute-multi-hops): Revert change of
+       2013-10-29 (r114834).
+
 2013-11-09  Andreas Schwab  <address@hidden>
 
        * progmodes/sh-script.el (sh-font-lock-keywords-var): Force

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-11-08 09:31:50 +0000
+++ b/lisp/net/tramp-sh.el      2013-11-10 08:35:04 +0000
@@ -4285,10 +4285,6 @@
          (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))

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-11-05 14:18:41 +0000
+++ b/lisp/net/tramp.el 2013-11-10 08:35:04 +0000
@@ -265,15 +265,6 @@
     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,