commit 4b3ecbb663c919132dddb3758e17a23089413519
author djm@openbsd.org <djm@openbsd.org> Fri Aug 11 04:41:08 2017 +0000
committer Damien Miller <djm@mindrot.org> Sat Aug 12 16:47:10 2017 +1000
tree a2d7e07728de7ff511dc492b5f0f8dac80f72249
parent 42a8f8bc288ef8cac504c5c73f09ed610bc74a34

upstream commit

don't print verbose error message when ssh disconnects
under sftp; bz#2750; ok dtucker@

Upstream-ID: 6d83708aed77b933c47cf155a87dc753ec01f370

sftp-client.c

diff --git a/sftp-client.c b/sftp-client.c
index a6e8322..6263302 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.126 2017/01/03 05:46:51 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.127 2017/08/11 04:41:08 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -140,7 +140,7 @@
 		fatal("%s: buffer error: %s", __func__, ssh_err(r));
 	if (atomicio6(read, conn->fd_in, p, 4,
 	    conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
-		if (errno == EPIPE)
+		if (errno == EPIPE || errno == ECONNRESET)
 			fatal("Connection closed");
 		else
 			fatal("Couldn't read packet: %s", strerror(errno));