diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-01-09 22:27:06 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-09 22:27:06 +1100 |
commit | 4b28251df4f1b653e7b3e015138c3da53a05bd58 (patch) | |
tree | aa4e51082e0dee943a33c278f17cbd2054f63d35 | |
parent | 37c1b3d6fc9043123f33e64051ea56656a5e7ef4 (diff) |
- dtucker@cvs.openbsd.org 2010/01/09 05:17:00
[roaming_client.c]
Remove a PRIu64 format string that snuck in with roaming. ok djm@
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | roaming_client.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -20,6 +20,9 @@ | |||
20 | [mux.c sshpty.h clientloop.c sshtty.c] | 20 | [mux.c sshpty.h clientloop.c sshtty.c] |
21 | quell tc[gs]etattr warnings when forcing a tty (ssh -tt), since we | 21 | quell tc[gs]etattr warnings when forcing a tty (ssh -tt), since we |
22 | usually don't actually have a tty to read/set; bz#1686 ok dtucker@ | 22 | usually don't actually have a tty to read/set; bz#1686 ok dtucker@ |
23 | - dtucker@cvs.openbsd.org 2010/01/09 05:17:00 | ||
24 | [roaming_client.c] | ||
25 | Remove a PRIu64 format string that snuck in with roaming. ok djm@ | ||
23 | 26 | ||
24 | 20091208 | 27 | 20091208 |
25 | - (dtucker) OpenBSD CVS Sync | 28 | - (dtucker) OpenBSD CVS Sync |
diff --git a/roaming_client.c b/roaming_client.c index c80db5826..cc387a544 100644 --- a/roaming_client.c +++ b/roaming_client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: roaming_client.c,v 1.1 2009/10/24 11:22:37 andreas Exp $ */ | 1 | /* $OpenBSD: roaming_client.c,v 1.2 2010/01/09 05:17:00 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2004-2009 AppGate Network Security AB | 3 | * Copyright (c) 2004-2009 AppGate Network Security AB |
4 | * | 4 | * |
@@ -122,7 +122,7 @@ roaming_auth_required(void) | |||
122 | calculate_new_key(&key1, cookie, chall); | 122 | calculate_new_key(&key1, cookie, chall); |
123 | calculate_new_key(&key2, cookie, chall); | 123 | calculate_new_key(&key2, cookie, chall); |
124 | 124 | ||
125 | debug("Received %" PRIu64 " bytes", get_recv_bytes()); | 125 | debug("Received %llu bytes", (long long unsigned)get_recv_bytes()); |
126 | debug("Sent roaming_auth packet"); | 126 | debug("Sent roaming_auth packet"); |
127 | } | 127 | } |
128 | 128 | ||
@@ -216,7 +216,7 @@ roaming_resume(void) | |||
216 | goto fail; | 216 | goto fail; |
217 | } | 217 | } |
218 | recv_bytes = packet_get_int64() ^ oldkey2; | 218 | recv_bytes = packet_get_int64() ^ oldkey2; |
219 | debug("Peer received %" PRIu64 " bytes", recv_bytes); | 219 | debug("Peer received %llu bytes", (long long unsigned)recv_bytes); |
220 | resend_bytes(packet_get_connection_out(), &recv_bytes); | 220 | resend_bytes(packet_get_connection_out(), &recv_bytes); |
221 | 221 | ||
222 | resume_in_progress = 0; | 222 | resume_in_progress = 0; |