summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-01-21 11:00:46 +1100
committerDamien Miller <djm@mindrot.org>2004-01-21 11:00:46 +1100
commit8f341f8b8b9e3fba2919b04cab2e3ce9df0f4139 (patch)
tree7e69c2b64f3a9bd48f6bbb8b1145831f506bac8a
parent86a396857d4021a5f17c018654e2b7759c84dd04 (diff)
- markus@cvs.openbsd.org 2004/01/13 19:23:15
[compress.c session.c] -Wall; ok henning
-rw-r--r--ChangeLog5
-rw-r--r--compress.c6
-rw-r--r--session.c6
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c6dc85e3..91cb0505f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 remove unnecessary Ic's; 9 remove unnecessary Ic's;
10 kill whitespace at EOL; 10 kill whitespace at EOL;
11 ok djm@ 11 ok djm@
12 - markus@cvs.openbsd.org 2004/01/13 19:23:15
13 [compress.c session.c]
14 -Wall; ok henning
12 15
1320040114 1620040114
14 - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits 17 - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
@@ -1678,4 +1681,4 @@
1678 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1681 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1679 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1682 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1680 1683
1681$Id: ChangeLog,v 1.3171 2004/01/21 00:00:04 djm Exp $ 1684$Id: ChangeLog,v 1.3172 2004/01/21 00:00:46 djm Exp $
diff --git a/compress.c b/compress.c
index 85a361d3a..2dea7cf36 100644
--- a/compress.c
+++ b/compress.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: compress.c,v 1.19 2002/03/18 17:31:54 provos Exp $"); 15RCSID("$OpenBSD: compress.c,v 1.20 2004/01/13 19:23:15 markus Exp $");
16 16
17#include "log.h" 17#include "log.h"
18#include "buffer.h" 18#include "buffer.h"
@@ -56,11 +56,11 @@ buffer_compress_init_recv(void)
56void 56void
57buffer_compress_uninit(void) 57buffer_compress_uninit(void)
58{ 58{
59 debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", 59 debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
60 outgoing_stream.total_in, outgoing_stream.total_out, 60 outgoing_stream.total_in, outgoing_stream.total_out,
61 outgoing_stream.total_in == 0 ? 0.0 : 61 outgoing_stream.total_in == 0 ? 0.0 :
62 (double) outgoing_stream.total_out / outgoing_stream.total_in); 62 (double) outgoing_stream.total_out / outgoing_stream.total_in);
63 debug("compress incoming: raw data %lu, compressed %lu, factor %.2f", 63 debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
64 incoming_stream.total_out, incoming_stream.total_in, 64 incoming_stream.total_out, incoming_stream.total_in,
65 incoming_stream.total_out == 0 ? 0.0 : 65 incoming_stream.total_out == 0 ? 0.0 :
66 (double) incoming_stream.total_in / incoming_stream.total_out); 66 (double) incoming_stream.total_in / incoming_stream.total_out);
diff --git a/session.c b/session.c
index cf6722c34..82e1996af 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.170 2003/12/23 16:12:10 jakob Exp $"); 36RCSID("$OpenBSD: session.c,v 1.171 2004/01/13 19:23:15 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -58,6 +58,10 @@ RCSID("$OpenBSD: session.c,v 1.170 2003/12/23 16:12:10 jakob Exp $");
58#include "session.h" 58#include "session.h"
59#include "monitor_wrap.h" 59#include "monitor_wrap.h"
60 60
61#ifdef KRB5
62#include <kafs.h>
63#endif
64
61#ifdef GSSAPI 65#ifdef GSSAPI
62#include "ssh-gss.h" 66#include "ssh-gss.h"
63#endif 67#endif