summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-08-11 04:41:09 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-08-11 04:41:09 +0000
commit5f3bb8a1f197b2f1cec1e099995eeeee6555dd40 (patch)
tree9ded2d30e267d0057d266a43cf1211bf90cb065e /usr.bin/ssh
parentab2b2d698d6cb5454a4bf53a046c61dcf0946c36 (diff)
don't print verbose error message when ssh disconnects under sftp;
bz#2750; ok dtucker@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/sftp-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c
index cdc6730ca5e..5db6b5d953a 100644
--- a/usr.bin/ssh/sftp-client.c
+++ b/usr.bin/ssh/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>
*
@@ -126,7 +126,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));