[openssh-commits] [openssh] 03/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 4b3ecbb663c919132dddb3758e17a23089413519
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Aug 11 04:41:08 2017 +0000

    upstream commit
    
    don't print verbose error message when ssh disconnects
    under sftp; bz#2750; ok dtucker@
    
    Upstream-ID: 6d83708aed77b933c47cf155a87dc753ec01f370
---
 sftp-client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sftp-client.c b/sftp-client.c
index a6e83227..62633026 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 at openbsd.org>
  *
@@ -140,7 +140,7 @@ get_msg(struct sftp_conn *conn, struct sshbuf *m)
 		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));

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.