From: mouring <mouring>
Date: Sun, 9 Jun 2002 20:06:29 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2002/06/08 12:36:53
X-Git-Tag: V_3_3_P1~52
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/61eb812e1a885b4b7daccd3f7baafbc5fa968bfb

   - markus@cvs.openbsd.org 2002/06/08 12:36:53
     [scp.c]
     remove FallBackToRsh
---

diff --git a/ChangeLog b/ChangeLog
index 91b72cd5..944900bb 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
diff --git a/scp.c b/scp.c
index 1fab4838..860dc108 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 = ".";