diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-06 11:47:28 +1100 |
commit | aae6c614da614eb10ced16505f35410671c95d9d (patch) | |
tree | 441e578781d38e7de4c5f609a4f86695d937e640 /packet.c | |
parent | dc33fc3910552c82518503b581efc1a51192fa76 (diff) |
- Merged OpenBSD CVS changes:
- [auth-krb4.c auth-passwd.c auth-skey.c ssh.
move skey-auth from auth-passwd.c to auth-s
- [auth-rsa.c]
warn only about mismatch if key is _used_
warn about keysize-mismatch with log() not
channels.c readconf.c readconf.h ssh.c ssh.
ports are u_short
- [hostfile.c]
indent, shorter warning
- [nchan.c]
use error() for internal errors
- [packet.c]
set loglevel for SSH_MSG_DISCONNECT to log(
serverloop.c
indent
- [ssh-add.1 ssh-add.c ssh.h]
document , reasonable default
- [ssh.1]
CheckHostIP is not available for connects v
- [sshconnect.c]
typo
easier to read client code for passwd and s
turn of checkhostip for proxy connects, sin
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: packet.c,v 1.6 1999/11/25 00:54:59 damien Exp $"); | 18 | RCSID("$Id: packet.c,v 1.7 1999/12/06 00:47:29 damien Exp $"); |
19 | 19 | ||
20 | #include "xmalloc.h" | 20 | #include "xmalloc.h" |
21 | #include "buffer.h" | 21 | #include "buffer.h" |
@@ -530,8 +530,10 @@ restart: | |||
530 | *payload_len_ptr = buffer_len(&incoming_packet); | 530 | *payload_len_ptr = buffer_len(&incoming_packet); |
531 | 531 | ||
532 | /* Handle disconnect message. */ | 532 | /* Handle disconnect message. */ |
533 | if ((unsigned char) buf[0] == SSH_MSG_DISCONNECT) | 533 | if ((unsigned char) buf[0] == SSH_MSG_DISCONNECT) { |
534 | fatal("Received disconnect: %.900s", packet_get_string(NULL)); | 534 | log("Received disconnect: %.900s", packet_get_string(NULL)); |
535 | fatal_cleanup(); | ||
536 | } | ||
535 | 537 | ||
536 | /* Ignore ignore messages. */ | 538 | /* Ignore ignore messages. */ |
537 | if ((unsigned char) buf[0] == SSH_MSG_IGNORE) | 539 | if ((unsigned char) buf[0] == SSH_MSG_IGNORE) |
@@ -662,7 +664,8 @@ packet_disconnect(const char *fmt,...) | |||
662 | packet_close(); | 664 | packet_close(); |
663 | 665 | ||
664 | /* Display the error locally and exit. */ | 666 | /* Display the error locally and exit. */ |
665 | fatal("Disconnecting: %.100s", buf); | 667 | log("Disconnecting: %.100s", buf); |
668 | fatal_cleanup(); | ||
666 | } | 669 | } |
667 | 670 | ||
668 | /* Checks if there is any buffered output, and tries to write some of the output. */ | 671 | /* Checks if there is any buffered output, and tries to write some of the output. */ |