- markus@cvs.openbsd.org 2002/06/08 12:36:53

     [scp.c]
     remove FallBackToRsh

diff --git a/ChangeLog b/ChangeLog
index 91b72cd532dac468167720ee21dbc227ea3d0137..944900bb73f1d2078e4bc3c4e6ca74e04481aaf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
    - markus@cvs.openbsd.org 2002/06/08 05:41:18
      [ssh_config]
      remove FallBackToRsh/UseRsh
+   - markus@cvs.openbsd.org 2002/06/08 12:36:53
+     [scp.c]
+     remove FallBackToRsh
 
 20020607
  - (bal) Removed --{enable/disable}-suid-ssh

diff --git a/scp.c b/scp.c
index 1fab48385688c1289b6c8ff473af3c699d91c11a..860dc108bd2cd72c92b6f69a58396338cc3a66eb 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.88 2002/04/06 18:24:09 mouring Exp $");
+RCSID("$OpenBSD: scp.c,v 1.89 2002/06/08 12:36:53 markus Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -230,7 +230,6 @@ main(argc, argv)
        addargs(&args, "ssh");          /* overwritten with ssh_program */
        addargs(&args, "-x");
        addargs(&args, "-oForwardAgent no");
-       addargs(&args, "-oFallBackToRsh no");
        addargs(&args, "-oClearAllForwardings yes");
 
        fflag = tflag = 0;
@@ -365,8 +364,7 @@ toremote(targ, argc, argv)
                src = colon(argv[i]);
                if (src) {      /* remote to remote */
                        static char *ssh_options =
-                           "-x -o'FallBackToRsh no' "
-                           "-o'ClearAllForwardings yes'";
+                           "-x -o'ClearAllForwardings yes'";
                        *src++ = 0;
                        if (*src == 0)
                                src = ".";