From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Tue, 11 Mar 2025 07:48:51 +0000 (+0000)
Subject: upstream: Set highwater when resuming a "put". Prevents bogus "server
X-Git-Tag: V_10_0_P1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29a5127f808d00aa539fd27d83a65c2c56179b0e;p=thirdparty%2Fopenssh-portable.git

upstream: Set highwater when resuming a "put". Prevents bogus "server

reordered acks" debug message.  ok djm@

OpenBSD-Commit-ID: aa7f6d0fc2e893c8c278ea3e6e0974c2eca83f5d
---

diff --git a/sftp-client.c b/sftp-client.c
index be40d2097..9f8ab4afa 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.176 2024/05/17 02:39:11 jsg Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.177 2025/03/11 07:48:51 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2091,6 +2091,7 @@ sftp_upload(struct sftp_conn *conn, const char *local_path,
 			close(local_fd);
 			return -1;
 		}
+		highwater = c.size;
 	}
 
 	openmode = SSH2_FXF_WRITE|SSH2_FXF_CREAT;