summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-09 21:27:49 +1100
committerDamien Miller <djm@mindrot.org>2000-03-09 21:27:49 +1100
commit98c7ad60ec5725d91da9f9f6d26cd9fe477398c0 (patch)
tree104c3e3474be8e308d05e22d79715c833c6cf837 /packet.c
parent1a07ebd4d8d39c6814bbd84c1aec4ebf2bd005a2 (diff)
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c] - int atomicio -> ssize_t (for alpha). ok deraadt@ [auth-rsa.c] - delay MD5 computation until client sends response, free() early, cleanup. [cipher.c] - void* -> unsigned char*, ok niels@ [hostfile.c] - remove unused variable 'len'. fix comments. - remove unused variable [log-client.c log-server.c] - rename a cpp symbol, to avoid param.h collision [packet.c] - missing xfree() - getsockname() requires initialized tolen; andy@guildsoftware.com - use getpeername() in packet_connection_is_on_socket(), fixes sshd -i; from Holger.Trapp@Informatik.TU-Chemnitz.DE [pty.c pty.h] - register cleanup for pty earlier. move code for pty-owner handling to pty.c ok provos@, dugsong@ [readconf.c] - turn off x11-fwd for the client, too. [rsa.c] - PKCS#1 padding [scp.c] - allow '.' in usernames; from jedgar@fxp.org [servconf.c] - typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de - sync with sshd_config [ssh-keygen.c] - enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@ [ssh.1] - Change invalid 'CHAT' loglevel to 'VERBOSE' [ssh.c] - suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp - turn off x11-fwd for the client, too. [sshconnect.c] - missing xfree() - retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp. - read error vs. "Connection closed by remote host" [sshd.8] - ie. -> i.e., - do not link to a commercial page.. - sync with sshd_config [sshd.c] - no need for poll.h; from bright@wintelcom.net - log with level log() not fatal() if peer behaves badly. - don't panic if client behaves strange. ok deraadt@ - make no-port-forwarding for RSA keys deny both -L and -R style fwding - delay close() of pty until the pty has been chowned back to root - oops, fix comment, too. - missing xfree() - move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too. (http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907) - register cleanup for pty earlier. move code for pty-owner handling to pty.c ok provos@, dugsong@ - create x11 cookie file - fix pr 1113, fclose() -> pclose(), todo: remote popen() - version 1.2.3 - Cleaned up
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/packet.c b/packet.c
index d0f3a895a..f65ae989d 100644
--- a/packet.c
+++ b/packet.c
@@ -15,7 +15,7 @@
15 */ 15 */
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$Id: packet.c,v 1.11 2000/01/22 22:38:00 damien Exp $"); 18RCSID("$Id: packet.c,v 1.12 2000/03/09 10:27:50 damien Exp $");
19 19
20#include "xmalloc.h" 20#include "xmalloc.h"
21#include "buffer.h" 21#include "buffer.h"
@@ -505,7 +505,7 @@ packet_read_poll(int *payload_len_ptr)
505{ 505{
506 unsigned int len, padded_len; 506 unsigned int len, padded_len;
507 unsigned char *ucp; 507 unsigned char *ucp;
508 char buf[8], *cp; 508 char buf[8], *cp, *msg;
509 unsigned int checksum, stored_checksum; 509 unsigned int checksum, stored_checksum;
510 510
511restart: 511restart:
@@ -575,7 +575,9 @@ restart:
575 575
576 /* Handle disconnect message. */ 576 /* Handle disconnect message. */
577 if ((unsigned char) buf[0] == SSH_MSG_DISCONNECT) { 577 if ((unsigned char) buf[0] == SSH_MSG_DISCONNECT) {
578 log("Received disconnect: %.900s", packet_get_string(NULL)); 578 msg = packet_get_string(NULL);
579 log("Received disconnect: %.900s", msg);
580 xfree(msg);
579 fatal_cleanup(); 581 fatal_cleanup();
580 } 582 }
581 583
@@ -585,7 +587,9 @@ restart:
585 587
586 /* Send debug messages as debugging output. */ 588 /* Send debug messages as debugging output. */
587 if ((unsigned char) buf[0] == SSH_MSG_DEBUG) { 589 if ((unsigned char) buf[0] == SSH_MSG_DEBUG) {
588 debug("Remote: %.900s", packet_get_string(NULL)); 590 msg = packet_get_string(NULL);
591 debug("Remote: %.900s", msg);
592 xfree(msg);
589 goto restart; 593 goto restart;
590 } 594 }
591 /* Return type. */ 595 /* Return type. */