RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so 

we use "openbsd-compat/sys-queue.h"
This commit is contained in:
Tim Rice 2010-01-16 16:48:39 -08:00
parent 4a7db1ca2f
commit f37756759f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -15,6 +15,8 @@
- (tim) [regress/portnum.sh] Shell portability fix. - (tim) [regress/portnum.sh] Shell portability fix.
- (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native
getaddrinfo() is too old and limited for addr_pton() in addrmatch.c. getaddrinfo() is too old and limited for addr_pton() in addrmatch.c.
- (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so
we use "openbsd-compat/sys-queue.h"
20100115 20100115
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

6
roaming_client.c
View File

@ -17,7 +17,7 @@
#include "includes.h" #include "includes.h"
#include <sys/queue.h> #include "openbsd-compat/sys-queue.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -122,7 +122,7 @@ roaming_auth_required(void)
calculate_new_key(&key1, cookie, chall); calculate_new_key(&key1, cookie, chall);
calculate_new_key(&key2, 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"); debug("Sent roaming_auth packet");
} }
@ -216,7 +216,7 @@ roaming_resume(void)
goto fail; goto fail;
} }
recv_bytes = packet_get_int64() ^ oldkey2; 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); resend_bytes(packet_get_connection_out(), &recv_bytes);
resume_in_progress = 0; resume_in_progress = 0;