- stevesk@cvs.openbsd.org 2001/05/19 19:43:57

     [misc.c misc.h servconf.c sshd.8 sshd.c]
     sshd command-line arguments and configuration file options that
     specify time may be expressed using a sequence of the form:
     time[qualifier], where time is a positive integer value and qualifier
     is one of the following:
         <none>,s,m,h,d,w
     Examples:
         600     600 seconds (10 minutes)
         10m     10 minutes
         1h30m   1 hour 30 minutes (90 minutes)
     ok markus@

1 files changed, 9 insertions, 3 deletions

diff --git a/sshd.c b/sshd.c
index a20b81cca..135c08bb0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.196 2001/05/18 14:13:29 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.197 2001/05/19 19:43:57 stevesk Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -618,10 +618,16 @@ main(int ac, char **av)
                         }
                         break;
                 case 'g':
-                        options.login_grace_time = atoi(optarg);
+                        if ((options.login_grace_time = convtime(optarg)) == -1) {
+                                fprintf(stderr, "Invalid login grace time.\n");
+                                exit(1);
+                        }
                         break;
                 case 'k':
-                        options.key_regeneration_time = atoi(optarg);
+                        if ((options.key_regeneration_time = convtime(optarg)) == -1) {
+                                fprintf(stderr, "Invalid key regeneration interval.\n");
+                                exit(1);
+                        }
                         break;
                 case 'h':
                         if (options.num_host_key_files >= MAX_HOSTKEYS) {