summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sftp.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 546671bf0..990778d46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
11 The authenticity of host 'bla' can't be established. 11 The authenticity of host 'bla' can't be established.
12 (protocol version 2 with pubkey authentication allows you to detect 12 (protocol version 2 with pubkey authentication allows you to detect
13 MITM attacks) 13 MITM attacks)
14 - mouring@cvs.openbsd.org 2002/07/25 01:16:59
15 [sftp.c]
16 FallBackToRsh does not exist anywhere else. Remove it from here.
17 OK deraadt.
14 18
1520020730 1920020730
16 - (bal) [uidswap.c] SCO compile correction by gert@greenie.muc.de 20 - (bal) [uidswap.c] SCO compile correction by gert@greenie.muc.de
@@ -1479,4 +1483,4 @@
1479 - (stevesk) entropy.c: typo in debug message 1483 - (stevesk) entropy.c: typo in debug message
1480 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1484 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1481 1485
1482$Id: ChangeLog,v 1.2410 2002/08/01 01:21:56 mouring Exp $ 1486$Id: ChangeLog,v 1.2411 2002/08/01 01:25:00 mouring Exp $
diff --git a/sftp.c b/sftp.c
index fac2564de..c4055b91e 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27RCSID("$OpenBSD: sftp.c,v 1.30 2002/06/23 09:30:14 deraadt Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.31 2002/07/25 01:16:59 mouring Exp $");
28 28
29/* XXX: short-form remote directory listings (like 'ls -C') */ 29/* XXX: short-form remote directory listings (like 'ls -C') */
30 30
@@ -122,7 +122,6 @@ main(int argc, char **argv)
122 __progname = get_progname(argv[0]); 122 __progname = get_progname(argv[0]);
123 args.list = NULL; 123 args.list = NULL;
124 addargs(&args, "ssh"); /* overwritten with ssh_program */ 124 addargs(&args, "ssh"); /* overwritten with ssh_program */
125 addargs(&args, "-oFallBackToRsh no");
126 addargs(&args, "-oForwardX11 no"); 125 addargs(&args, "-oForwardX11 no");
127 addargs(&args, "-oForwardAgent no"); 126 addargs(&args, "-oForwardAgent no");
128 addargs(&args, "-oClearAllForwardings yes"); 127 addargs(&args, "-oClearAllForwardings yes");