diff options
| author | des <des@FreeBSD.org> | 2011-10-05 22:08:17 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-10-05 22:08:17 +0000 |
| commit | 038442ad80c21a07c19532a176030e2ca51fdd9d (patch) | |
| tree | 654e40360db9b6bb67928b3a5c1b5dbd84925000 /crypto/openssh/ssh-keyscan.c | |
| parent | 2276ee273397e0ccd5c7911848e3de9bd91fb1c2 (diff) | |
| parent | a9c7316f0b012b7e85d1a1c4d8b6ce36b9fd9604 (diff) | |
| download | FreeBSD-src-038442ad80c21a07c19532a176030e2ca51fdd9d.zip FreeBSD-src-038442ad80c21a07c19532a176030e2ca51fdd9d.tar.gz | |
Upgrade to OpenSSH 5.9p1.
MFC after: 3 months
Diffstat (limited to 'crypto/openssh/ssh-keyscan.c')
| -rw-r--r-- | crypto/openssh/ssh-keyscan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/openssh/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c index 25d7ac6..b085dd4 100644 --- a/crypto/openssh/ssh-keyscan.c +++ b/crypto/openssh/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)); @@ -620,7 +620,6 @@ main(int argc, char **argv) extern char *optarg; __progname = ssh_get_progname(argv[0]); - init_rng(); seed_rng(); TAILQ_INIT(&tq); |
