summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-16 13:18:04 +1100
committerDamien Miller <djm@mindrot.org>1999-12-16 13:18:04 +1100
commit5e7c10eedb1745b9d72dd184ceede504d92e5a3a (patch)
treeefe7b3894512f04a8b1f329f8ab5cb6ea3a361dd /packet.c
parent18ccf85863520823b9210dfd1d67366d90d74735 (diff)
- Merged OpenBSD CVS changes:
- [authfd.c ssh-agent.c] keysize warnings talk about identity files - [packet.c] "Connection closed by x.x.x.x": fatal() -> log()
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index 9e8cf2e3..17f6f6e3 100644
--- a/packet.c
+++ b/packet.c
@@ -15,7 +15,7 @@
*/
#include "includes.h"
-RCSID("$Id: packet.c,v 1.7 1999/12/06 00:47:29 damien Exp $");
+RCSID("$Id: packet.c,v 1.8 1999/12/16 02:18:04 damien Exp $");
#include "xmalloc.h"
#include "buffer.h"
@@ -415,8 +415,10 @@ packet_read(int *payload_len_ptr)
/* Read data from the socket. */
len = read(connection_in, buf, sizeof(buf));
- if (len == 0)
- fatal("Connection closed by %.200s", get_remote_ipaddr());
+ if (len == 0) {
+ log("Connection closed by %.200s", get_remote_ipaddr());
+ fatal_cleanup();
+ }
if (len < 0)
fatal("Read from socket failed: %.100s", strerror(errno));
/* Append it to the buffer. */