[ssh-keyscan.c]
     use TAILQ_xx macro.  from lukem@netbsd.  markus ok
This commit is contained in:
Ben Lindstrom 2002-06-21 00:09:54 +00:00
parent 2b266b7f08
commit 61c183bea3
2 changed files with 8 additions and 5 deletions

View File

@ -17,6 +17,9 @@
remove the CONSTRAIN_IDENTITY messages and introduce a new remove the CONSTRAIN_IDENTITY messages and introduce a new
ADD_ID message with contraints instead. contraints can be ADD_ID message with contraints instead. contraints can be
only added together with the private key. only added together with the private key.
- itojun@cvs.openbsd.org 2002/06/16 21:30:58
[ssh-keyscan.c]
use TAILQ_xx macro. from lukem@netbsd. markus ok
20020613 20020613
- (bal) typo of setgroup for cygwin. Patch by vinschen@redhat.com - (bal) typo of setgroup for cygwin. Patch by vinschen@redhat.com
@ -945,4 +948,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2221 2002/06/21 00:08:39 mouring Exp $ $Id: ChangeLog,v 1.2222 2002/06/21 00:09:54 mouring Exp $

View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keyscan.c,v 1.35 2002/03/04 18:30:23 stevesk Exp $"); RCSID("$OpenBSD: ssh-keyscan.c,v 1.36 2002/06/16 21:30:58 itojun Exp $");
#include "openbsd-compat/fake-queue.h" #include "openbsd-compat/fake-queue.h"
@ -600,7 +600,7 @@ conloop(void)
con *c; con *c;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
c = tq.tqh_first; c = TAILQ_FIRST(&tq);
if (c && (c->c_tv.tv_sec > now.tv_sec || if (c && (c->c_tv.tv_sec > now.tv_sec ||
(c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec > now.tv_usec))) { (c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec > now.tv_usec))) {
@ -633,12 +633,12 @@ conloop(void)
xfree(r); xfree(r);
xfree(e); xfree(e);
c = tq.tqh_first; c = TAILQ_FIRST(&tq);
while (c && (c->c_tv.tv_sec < now.tv_sec || while (c && (c->c_tv.tv_sec < now.tv_sec ||
(c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec < now.tv_usec))) { (c->c_tv.tv_sec == now.tv_sec && c->c_tv.tv_usec < now.tv_usec))) {
int s = c->c_fd; int s = c->c_fd;
c = c->c_link.tqe_next; c = TAILQ_NEXT(c, c_link);
conrecycle(s); conrecycle(s);
} }
} }