diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-16 13:18:04 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-16 13:18:04 +1100 |
commit | 5e7c10eedb1745b9d72dd184ceede504d92e5a3a (patch) | |
tree | efe7b3894512f04a8b1f329f8ab5cb6ea3a361dd /packet.c | |
parent | 18ccf85863520823b9210dfd1d67366d90d74735 (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.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: packet.c,v 1.7 1999/12/06 00:47:29 damien Exp $"); | 18 | RCSID("$Id: packet.c,v 1.8 1999/12/16 02:18:04 damien Exp $"); |
19 | 19 | ||
20 | #include "xmalloc.h" | 20 | #include "xmalloc.h" |
21 | #include "buffer.h" | 21 | #include "buffer.h" |
@@ -415,8 +415,10 @@ packet_read(int *payload_len_ptr) | |||
415 | 415 | ||
416 | /* Read data from the socket. */ | 416 | /* Read data from the socket. */ |
417 | len = read(connection_in, buf, sizeof(buf)); | 417 | len = read(connection_in, buf, sizeof(buf)); |
418 | if (len == 0) | 418 | if (len == 0) { |
419 | fatal("Connection closed by %.200s", get_remote_ipaddr()); | 419 | log("Connection closed by %.200s", get_remote_ipaddr()); |
420 | fatal_cleanup(); | ||
421 | } | ||
420 | if (len < 0) | 422 | if (len < 0) |
421 | fatal("Read from socket failed: %.100s", strerror(errno)); | 423 | fatal("Read from socket failed: %.100s", strerror(errno)); |
422 | /* Append it to the buffer. */ | 424 | /* Append it to the buffer. */ |