From: Damien Miller <djm@mindrot.org>
Date: Fri, 6 Jan 2023 08:13:36 +0000 (+1100)
Subject: unbreak scp on NetBSD 4.x
X-Git-Tag: V_9_2_P1~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab6bb69e251faa8b24f81b25c72ec0120f20cad4;p=thirdparty%2Fopenssh-portable.git

unbreak scp on NetBSD 4.x

e555d5cad5 effectively increased the default copy buffer size for SFTP
transfers. This caused NetBSD 4.x to hang during the "copy local file to
remote file in place" scp.sh regression test.

This puts back the original 32KB copy buffer size until we can properly
figure out why.

lots of debugging assistance from dtucker@
---

diff --git a/scp.c b/scp.c
index 9e74c9d41..93ac8ed7b 100644
--- a/scp.c
+++ b/scp.c
@@ -180,7 +180,7 @@ pid_t do_cmd_pid = -1;
 pid_t do_cmd_pid2 = -1;
 
 /* SFTP copy parameters */
-size_t sftp_copy_buflen;
+size_t sftp_copy_buflen = 32768; /* XXX NetBSD4 hangs with default value */
 size_t sftp_nrequests;
 
 /* Needed for sftp */