From f37756759fef9ad9a65080424f50cbcfdbc6e512 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Sat, 16 Jan 2010 16:48:39 -0800 Subject: [PATCH] - (tim) [roaming_client.c] Use of is not really portable so we use "openbsd-compat/sys-queue.h" --- ChangeLog | 2 ++ roaming_client.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00d78c698..145955680 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ - (tim) [regress/portnum.sh] Shell portability fix. - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native getaddrinfo() is too old and limited for addr_pton() in addrmatch.c. + - (tim) [roaming_client.c] Use of is not really portable so + we use "openbsd-compat/sys-queue.h" 20100115 - (dtucker) OpenBSD CVS Sync diff --git a/roaming_client.c b/roaming_client.c index cc387a544..c0dd9ea9c 100644 --- a/roaming_client.c +++ b/roaming_client.c @@ -17,7 +17,7 @@ #include "includes.h" -#include +#include "openbsd-compat/sys-queue.h" #include #include @@ -122,7 +122,7 @@ roaming_auth_required(void) calculate_new_key(&key1, cookie, chall); calculate_new_key(&key2, cookie, chall); - debug("Received %llu bytes", (long long unsigned)get_recv_bytes()); + debug("Received %llu bytes", (unsigned long long)get_recv_bytes()); debug("Sent roaming_auth packet"); } @@ -216,7 +216,7 @@ roaming_resume(void) goto fail; } recv_bytes = packet_get_int64() ^ oldkey2; - debug("Peer received %llu bytes", (long long unsigned)recv_bytes); + debug("Peer received %llu bytes", (unsigned long long)recv_bytes); resend_bytes(packet_get_connection_out(), &recv_bytes); resume_in_progress = 0;