packet.c

send debug messages in SSH2 format

diff --git a/ChangeLog b/ChangeLog
index ae6348c5c1898915efb31b3a212042d17b2a28b4..7fe9389c9afe00ca58fb85e117066b3308e936ef 100644 (file)
--- 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 6ff6417a8ce74c0f530a802507db08e2514b756e..c8c11b003a400e5ebaf584cd6f8b4bbbd9be831b 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -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();
 }