2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 24b13ad0e..8a7083236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
      allow GSSAPI authentication to detect when a server-side failure causes
      authentication failure and don't count such failures against MaxAuthTries;
      bz#1244 from simon AT sxw.org.uk; ok markus@ before lock
+   - okan@cvs.openbsd.org 2011/03/15 10:36:02
+     [ssh-keyscan.c]
+     use timerclear macro
+     ok djm@
 
 20110221
  - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index eb282b948..b085dd417 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.84 2011/01/04 20:44:13 otto Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.85 2011/03/15 10:36:02 okan Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -535,7 +535,7 @@ conloop(void)
                         seltime.tv_sec--;
                 }
         } else
-                seltime.tv_sec = seltime.tv_usec = 0;
+                timerclear(&seltime);
 
         r = xcalloc(read_wait_nfdset, sizeof(fd_mask));
         e = xcalloc(read_wait_nfdset, sizeof(fd_mask));