diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.c | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -15,6 +15,9 @@ | |||
15 | - markus@cvs.openbsd.org 2002/06/08 05:41:18 | 15 | - markus@cvs.openbsd.org 2002/06/08 05:41:18 |
16 | [ssh_config] | 16 | [ssh_config] |
17 | remove FallBackToRsh/UseRsh | 17 | remove FallBackToRsh/UseRsh |
18 | - markus@cvs.openbsd.org 2002/06/08 12:36:53 | ||
19 | [scp.c] | ||
20 | remove FallBackToRsh | ||
18 | 21 | ||
19 | 20020607 | 22 | 20020607 |
20 | - (bal) Removed --{enable/disable}-suid-ssh | 23 | - (bal) Removed --{enable/disable}-suid-ssh |
@@ -846,4 +849,4 @@ | |||
846 | - (stevesk) entropy.c: typo in debug message | 849 | - (stevesk) entropy.c: typo in debug message |
847 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 850 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
848 | 851 | ||
849 | $Id: ChangeLog,v 1.2193 2002/06/09 20:05:35 mouring Exp $ | 852 | $Id: ChangeLog,v 1.2194 2002/06/09 20:06:29 mouring Exp $ |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.88 2002/04/06 18:24:09 mouring Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.89 2002/06/08 12:36:53 markus Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -230,7 +230,6 @@ main(argc, argv) | |||
230 | addargs(&args, "ssh"); /* overwritten with ssh_program */ | 230 | addargs(&args, "ssh"); /* overwritten with ssh_program */ |
231 | addargs(&args, "-x"); | 231 | addargs(&args, "-x"); |
232 | addargs(&args, "-oForwardAgent no"); | 232 | addargs(&args, "-oForwardAgent no"); |
233 | addargs(&args, "-oFallBackToRsh no"); | ||
234 | addargs(&args, "-oClearAllForwardings yes"); | 233 | addargs(&args, "-oClearAllForwardings yes"); |
235 | 234 | ||
236 | fflag = tflag = 0; | 235 | fflag = tflag = 0; |
@@ -365,8 +364,7 @@ toremote(targ, argc, argv) | |||
365 | src = colon(argv[i]); | 364 | src = colon(argv[i]); |
366 | if (src) { /* remote to remote */ | 365 | if (src) { /* remote to remote */ |
367 | static char *ssh_options = | 366 | static char *ssh_options = |
368 | "-x -o'FallBackToRsh no' " | 367 | "-x -o'ClearAllForwardings yes'"; |
369 | "-o'ClearAllForwardings yes'"; | ||
370 | *src++ = 0; | 368 | *src++ = 0; |
371 | if (*src == 0) | 369 | if (*src == 0) |
372 | src = "."; | 370 | src = "."; |