upstream: and we go back to testing sftp-scp after the 8.9

release...

OpenBSD-Commit-ID: a80440168258adca543a4607b871327a279c569c
This commit is contained in:
deraadt@openbsd.org 2022-02-23 19:01:00 +00:00 committed by Damien Miller
parent 166456ceda
commit 449bcb8403

4
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.245 2022/02/10 04:12:38 djm Exp $ */ /* $OpenBSD: scp.c,v 1.246 2022/02/23 19:01:00 deraadt Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -449,7 +449,7 @@ main(int argc, char **argv)
const char *errstr; const char *errstr;
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
enum scp_mode_e mode = MODE_SCP; enum scp_mode_e mode = MODE_SFTP;
char *sftp_direct = NULL; char *sftp_direct = NULL;
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */