tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/06/27 19:49:08 

[ssh-keyscan.c]
     use convtime(); ok markus@
This commit is contained in:
Ben Lindstrom 2002-07-04 00:07:13 +00:00
parent eec16fcb27
commit edd098b196
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -12,6 +12,9 @@
- deraadt@cvs.openbsd.org 2002/06/27 10:35:47 - deraadt@cvs.openbsd.org 2002/06/27 10:35:47
[auth2-none.c monitor.c sftp-client.c] [auth2-none.c monitor.c sftp-client.c]
use xfree() use xfree()
- stevesk@cvs.openbsd.org 2002/06/27 19:49:08
[ssh-keyscan.c]
use convtime(); ok markus@
20020702 20020702
- (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc & - (djm) Use PAM_MSG_MEMBER for PAM_TEXT_INFO messages, use xmalloc &
@ -1220,4 +1223,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

8
ssh-keyscan.c
View File

@ -7,7 +7,7 @@
*/ */
#include "includes.h" #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" #include "openbsd-compat/fake-queue.h"
@ -718,9 +718,11 @@ main(int argc, char **argv)
} }
break; break;
case 'T': case 'T':
timeout = atoi(optarg); timeout = convtime(optarg);
if (timeout <= 0) if (timeout == -1 || timeout == 0) {
fprintf(stderr, "Bad timeout '%s'\n", optarg);
usage(); usage();
}
break; break;
case 'v': case 'v':
if (!debug_flag) { if (!debug_flag) {