diff options
author | Damien Miller <djm@mindrot.org> | 2000-06-18 14:50:44 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-06-18 14:50:44 +1000 |
commit | f6d9e2218998559cb67aad55d3f4a0bf53600c41 (patch) | |
tree | 87ea430020c66c697e065c164951b3f74b730b76 /scp.c | |
parent | 7b22d65034ac280e0b4eaa857c71b17ee3ad7d99 (diff) |
- OpenBSD CVS updates:
- deraadt@cvs.openbsd.org 2000/06/17 09:58:46
[channels.c]
everyone says "nix it" (remove protocol 2 debugging message)
- markus@cvs.openbsd.org 2000/06/17 13:24:34
[sshconnect.c]
allow extended server banners
- markus@cvs.openbsd.org 2000/06/17 14:30:10
[sshconnect.c]
missing atomicio, typo
- jakob@cvs.openbsd.org 2000/06/17 16:52:34
[servconf.c servconf.h session.c sshd.8 sshd_config]
add support for ssh v2 subsystems. ok markus@.
- deraadt@cvs.openbsd.org 2000/06/17 18:57:48
[readconf.c servconf.c]
include = in WHITESPACE; markus ok
- markus@cvs.openbsd.org 2000/06/17 19:09:10
[auth2.c]
implement bug compatibility with ssh-2.0.13 pubkey, server side
- markus@cvs.openbsd.org 2000/06/17 21:00:28
[compat.c]
initial support for ssh.com's 2.2.0
- markus@cvs.openbsd.org 2000/06/17 21:16:09
[scp.c]
typo
- markus@cvs.openbsd.org 2000/06/17 22:05:02
[auth-rsa.c auth2.c serverloop.c session.c auth-options.c auth-options.h]
split auth-rsa option parsing into auth-options
add options support to authorized_keys2
- markus@cvs.openbsd.org 2000/06/17 22:42:54
[session.c]
typo
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -45,7 +45,7 @@ | |||
45 | */ | 45 | */ |
46 | 46 | ||
47 | #include "includes.h" | 47 | #include "includes.h" |
48 | RCSID("$Id: scp.c,v 1.23 2000/05/17 12:53:35 damien Exp $"); | 48 | RCSID("$Id: scp.c,v 1.24 2000/06/18 04:50:44 djm Exp $"); |
49 | 49 | ||
50 | #include "ssh.h" | 50 | #include "ssh.h" |
51 | #include "xmalloc.h" | 51 | #include "xmalloc.h" |
@@ -155,7 +155,6 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout) | |||
155 | args[i++] = "-4"; | 155 | args[i++] = "-4"; |
156 | if (IPv6) | 156 | if (IPv6) |
157 | args[i++] = "-6"; | 157 | args[i++] = "-6"; |
158 | args[i++] = "-oFallBackToRsh no"; | ||
159 | if (verbose_mode) | 158 | if (verbose_mode) |
160 | args[i++] = "-v"; | 159 | args[i++] = "-v"; |
161 | if (compress_flag) | 160 | if (compress_flag) |
@@ -1008,7 +1007,7 @@ run_err(const char *fmt,...) | |||
1008 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 1007 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
1009 | * SUCH DAMAGE. | 1008 | * SUCH DAMAGE. |
1010 | * | 1009 | * |
1011 | * $Id: scp.c,v 1.23 2000/05/17 12:53:35 damien Exp $ | 1010 | * $Id: scp.c,v 1.24 2000/06/18 04:50:44 djm Exp $ |
1012 | */ | 1011 | */ |
1013 | 1012 | ||
1014 | char * | 1013 | char * |