summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keyscan.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index beef5339a..014aa9480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - deraadt@cvs.openbsd.org 2002/06/27 10:35:47 12 - deraadt@cvs.openbsd.org 2002/06/27 10:35:47
13 [auth2-none.c monitor.c sftp-client.c] 13 [auth2-none.c monitor.c sftp-client.c]
14 use xfree() 14 use xfree()
15 - stevesk@cvs.openbsd.org 2002/06/27 19:49:08
16 [ssh-keyscan.c]
17 use convtime(); ok markus@
15 18
1620020702 1920020702
17 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & 20 - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@@ -1220,4 +1223,4 @@
1220 - (stevesk) entropy.c: typo in debug message 1223 - (stevesk) entropy.c: typo in debug message
1221 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1224 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1222 1225
1223$Id: ChangeLog,v 1.2318 2002/07/04 00:06:15 mouring Exp $ 1226$Id: ChangeLog,v 1.2319 2002/07/04 00:07:13 mouring Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index d9bbb91f8..cd8b63488 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,7 +7,7 @@
7 */ 7 */
8 8
9#include "includes.h" 9#include "includes.h"
10RCSID("$OpenBSD: ssh-keyscan.c,v 1.37 2002/06/27 08:49:44 markus Exp $"); 10RCSID("$OpenBSD: ssh-keyscan.c,v 1.38 2002/06/27 19:49:08 stevesk Exp $");
11 11
12#include "openbsd-compat/fake-queue.h" 12#include "openbsd-compat/fake-queue.h"
13 13
@@ -718,9 +718,11 @@ main(int argc, char **argv)
718 } 718 }
719 break; 719 break;
720 case 'T': 720 case 'T':
721 timeout = atoi(optarg); 721 timeout = convtime(optarg);
722 if (timeout <= 0) 722 if (timeout == -1 || timeout == 0) {
723 fprintf(stderr, "Bad timeout '%s'\n", optarg);
723 usage(); 724 usage();
725 }
724 break; 726 break;
725 case 'v': 727 case 'v':
726 if (!debug_flag) { 728 if (!debug_flag) {