- stevesk@cvs.openbsd.org 2002/06/27 19:49:08
[ssh-keyscan.c]
use convtime(); ok markus@
diff --git a/ChangeLog b/ChangeLog
index beef533..014aa94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- deraadt@cvs.openbsd.org 2002/06/27 10:35:47
[auth2-none.c monitor.c sftp-client.c]
use xfree()
+ - stevesk@cvs.openbsd.org 2002/06/27 19:49:08
+ [ssh-keyscan.c]
+ use convtime(); ok markus@
20020702
- (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1220,4 +1223,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2318 2002/07/04 00:06:15 mouring Exp $
+$Id: ChangeLog,v 1.2319 2002/07/04 00:07:13 mouring Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index d9bbb91..cd8b634 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.37 2002/06/27 08:49:44 markus Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.38 2002/06/27 19:49:08 stevesk Exp $");
#include "openbsd-compat/fake-queue.h"
@@ -718,9 +718,11 @@
}
break;
case 'T':
- timeout = atoi(optarg);
- if (timeout <= 0)
+ timeout = convtime(optarg);
+ if (timeout == -1 || timeout == 0) {
+ fprintf(stderr, "Bad timeout '%s'\n", optarg);
usage();
+ }
break;
case 'v':
if (!debug_flag) {