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

     [scp.c]
     remove FallBackToRsh

2 files changed, 6 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9218c0ebf..b177fe72c 100644
--- 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
@@ -846,4 +849,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2193 2002/06/09 20:05:35 mouring Exp $
+$Id: ChangeLog,v 1.2194 2002/06/09 20:06:29 mouring Exp $
diff --git a/scp.c b/scp.c
index 1fab48385..860dc108b 100644
--- 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 = ".";