Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 7 insertions, 5 deletions

diff --git a/compress.c b/compress.c
index 85a361d3a..0d1c7e55e 100644
--- a/compress.c
+++ b/compress.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.19 2002/03/18 17:31:54 provos Exp $");
+RCSID("$OpenBSD: compress.c,v 1.21 2004/01/13 19:45:15 markus Exp $");
 
 #include "log.h"
 #include "buffer.h"
@@ -56,12 +56,14 @@ buffer_compress_init_recv(void)
 void
 buffer_compress_uninit(void)
 {
-        debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
-            outgoing_stream.total_in, outgoing_stream.total_out,
+        debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
+            (unsigned long long)outgoing_stream.total_in,
+            (unsigned long long)outgoing_stream.total_out,
             outgoing_stream.total_in == 0 ? 0.0 :
             (double) outgoing_stream.total_out / outgoing_stream.total_in);
-        debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
-            incoming_stream.total_out, incoming_stream.total_in,
+        debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
+            (unsigned long long)incoming_stream.total_out,
+            (unsigned long long)incoming_stream.total_in,
             incoming_stream.total_out == 0 ? 0.0 :
             (double) incoming_stream.total_in / incoming_stream.total_out);
         if (compress_init_recv_called == 1 && inflate_failed == 0)