diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-08-11 04:41:08 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-08-12 16:47:10 +1000 |
commit | 4b3ecbb663c919132dddb3758e17a23089413519 (patch) | |
tree | a2d7e07728de7ff511dc492b5f0f8dac80f72249 | |
parent | 42a8f8bc288ef8cac504c5c73f09ed610bc74a34 (diff) |
upstream commit
don't print verbose error message when ssh disconnects
under sftp; bz#2750; ok dtucker@
Upstream-ID: 6d83708aed77b933c47cf155a87dc753ec01f370
-rw-r--r-- | sftp-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-client.c b/sftp-client.c index a6e832270..626330262 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.126 2017/01/03 05:46:51 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.127 2017/08/11 04:41:08 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -140,7 +140,7 @@ get_msg(struct sftp_conn *conn, struct sshbuf *m) | |||
140 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | 140 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
141 | if (atomicio6(read, conn->fd_in, p, 4, | 141 | if (atomicio6(read, conn->fd_in, p, 4, |
142 | conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) { | 142 | conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) { |
143 | if (errno == EPIPE) | 143 | if (errno == EPIPE || errno == ECONNRESET) |
144 | fatal("Connection closed"); | 144 | fatal("Connection closed"); |
145 | else | 145 | else |
146 | fatal("Couldn't read packet: %s", strerror(errno)); | 146 | fatal("Couldn't read packet: %s", strerror(errno)); |