tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: run the 2nd ssh with BatchMode for scp -3 

OpenBSD-Commit-ID: 77994fc8c7ca02d88e6d0d06d0f0fe842a935748
This commit is contained in:
markus@openbsd.org 2020-04-30 17:07:10 +00:00 committed by Damien Miller
parent 59d2de956e
commit ea14103ce9
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scp.1
View File

@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
.\" $OpenBSD: scp.1,v 1.87 2019/11/30 07:07:59 jmc Exp $
.\" $OpenBSD: scp.1,v 1.88 2020/04/30 17:07:10 markus Exp $
.\"
.Dd $Mdocdate: November 30 2019 $
.Dd $Mdocdate: April 30 2020 $
.Dt SCP 1
.Os
.Sh NAME
@ -74,7 +74,10 @@ The options are as follows:
Copies between two remote hosts are transferred through the local host.
Without this option the data is copied directly between the two remote
hosts.
Note that this option disables the progress meter.
Note that this option disables the progress meter and selects batch mode
for the second host, since
.Nm scp
cannot ask passwords or passphrases for both hosts.
.It Fl 4
Forces
.Nm

3
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.207 2020/01/23 07:10:22 dtucker Exp $ */
/* $OpenBSD: scp.c,v 1.208 2020/04/30 17:07:10 markus Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@ -348,6 +348,7 @@ do_cmd2(char *host, char *remuser, int port, char *cmd, int fdin, int fdout)
addargs(&args, "-l");
addargs(&args, "%s", remuser);
}
addargs(&args, "-oBatchMode=yes");
addargs(&args, "--");
addargs(&args, "%s", host);
addargs(&args, "%s", cmd);