diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /ssh-keyscan.c | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r-- | ssh-keyscan.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 25d7ac66f..b085dd417 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keyscan.c,v 1.84 2011/01/04 20:44:13 otto Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.85 2011/03/15 10:36:02 okan Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
4 | * | 4 | * |
@@ -535,7 +535,7 @@ conloop(void) | |||
535 | seltime.tv_sec--; | 535 | seltime.tv_sec--; |
536 | } | 536 | } |
537 | } else | 537 | } else |
538 | seltime.tv_sec = seltime.tv_usec = 0; | 538 | timerclear(&seltime); |
539 | 539 | ||
540 | r = xcalloc(read_wait_nfdset, sizeof(fd_mask)); | 540 | r = xcalloc(read_wait_nfdset, sizeof(fd_mask)); |
541 | e = xcalloc(read_wait_nfdset, sizeof(fd_mask)); | 541 | e = xcalloc(read_wait_nfdset, sizeof(fd_mask)); |
@@ -620,7 +620,6 @@ main(int argc, char **argv) | |||
620 | extern char *optarg; | 620 | extern char *optarg; |
621 | 621 | ||
622 | __progname = ssh_get_progname(argv[0]); | 622 | __progname = ssh_get_progname(argv[0]); |
623 | init_rng(); | ||
624 | seed_rng(); | 623 | seed_rng(); |
625 | TAILQ_INIT(&tq); | 624 | TAILQ_INIT(&tq); |
626 | 625 | ||