From: Damien Miller <djm@mindrot.org>
Date: Sun, 30 Apr 2000 22:24:07 +0000 (+1000)
Subject: packet.c
X-Git-Tag: V_2_0_0_BETA1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c8af4fca8ab675245aa5532f80a2f06d6c080c1;p=thirdparty%2Fopenssh-portable.git

packet.c
send debug messages in SSH2 format
---

diff --git a/ChangeLog b/ChangeLog
index ae6348c5c..7fe9389c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20000501
+ - OpenBSD CVS update
+   [packet.c]
+   - send debug messages in SSH2 format
+
 20000430
  - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au>
  - Integrate Andre Lucas' <andre.lucas@dial.pipex.com> entropy collection
diff --git a/packet.c b/packet.c
index e32c70546..73a96b986 100644
--- a/packet.c
+++ b/packet.c
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: packet.c,v 1.19 2000/04/16 02:31:51 damien Exp $");
+RCSID("$Id: packet.c,v 1.20 2000/04/30 22:24:07 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -1093,8 +1093,15 @@ packet_send_debug(const char *fmt,...)
 	vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
 
-	packet_start(SSH_MSG_DEBUG);
-	packet_put_string(buf, strlen(buf));
+	if (compat20) {
+		packet_start(SSH2_MSG_DEBUG);
+		packet_put_char(0);	/* bool: always display */
+		packet_put_cstring(buf);
+		packet_put_cstring("");
+	} else {
+		packet_start(SSH_MSG_DEBUG);
+		packet_put_cstring(buf);
+	}
 	packet_send();
 	packet_write_wait();
 }