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 e32c7054644ef9130ae0afba0d00865a2d608c0c..73a96b986a49c4ba6e68671321d64009e2dac767 100644 (file)
--- 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();
 }