summaryrefslogtreecommitdiffstats
path: root/scp.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-02-10 05:12:38 +0100
committerDamien Miller <djm@mindrot.org>2022-02-10 05:14:24 +0100
commit9699151b039ecc5fad9ac6c6c02e9afdbd26f15f (patch)
treedc98981e19babb25359c02cafb57ef32e00a1da7 /scp.c
parentupstream: Switch hpdelim interface to accept only ":" as delimiter. (diff)
downloadopenssh-9699151b039ecc5fad9ac6c6c02e9afdbd26f15f.tar.xz
openssh-9699151b039ecc5fad9ac6c6c02e9afdbd26f15f.zip
upstream: revert for imminent OpenSSH release, which wil ship with
scp in RCP mode. > revision 1.106 > date: 2021/10/15 14:46:46; author: deraadt; state: Exp; lines: +13 -9; commitid: w5n9B2RE38tFfggl; > openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP > protocol for copying. Let's get back to testing the SFTP protocol. This will be put back once the OpenSSH release is done. OpenBSD-Commit-ID: 0c725481a78210aceecff1537322c0b2df03e768
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp.c b/scp.c
index 82fa66b91..519bffa1b 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.244 2022/02/01 23:11:11 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.245 2022/02/10 04:12:38 djm Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -449,7 +449,7 @@ main(int argc, char **argv)
const char *errstr;
extern char *optarg;
extern int optind;
- enum scp_mode_e mode = MODE_SFTP;
+ enum scp_mode_e mode = MODE_SCP;
char *sftp_direct = NULL;
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */