- stevesk@cvs.openbsd.org 2002/07/23 16:03:10

     [sshd.c]
     utmp_len is unsigned; display error consistent with other options.
     ok markus@

2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a444a70c..0760974eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@
    - stevesk@cvs.openbsd.org 2002/07/22 17:32:56
      [monitor.c]
      u_int here; ok provos@
+   - stevesk@cvs.openbsd.org 2002/07/23 16:03:10
+     [sshd.c]
+     utmp_len is unsigned; display error consistent with other options.
+     ok markus@
 
 20020722
  - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk
@@ -1445,4 +1449,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2401 2002/07/23 21:13:40 mouring Exp $
+$Id: ChangeLog,v 1.2402 2002/07/23 21:15:13 mouring Exp $
diff --git a/sshd.c b/sshd.c
index 427ca3545..55c57e195 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.256 2002/07/19 15:43:33 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.257 2002/07/23 16:03:10 stevesk Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -911,8 +911,10 @@ main(int ac, char **av)
                         break;
                 case 'u':
                         utmp_len = atoi(optarg);
-                        if (utmp_len < 0 || utmp_len > MAXHOSTNAMELEN)
-                                usage();
+                        if (utmp_len > MAXHOSTNAMELEN) {
+                                fprintf(stderr, "Invalid utmp length.\n");
+                                exit(1);
+                        }
                         break;
                 case 'o':
                         if (process_server_config_line(&options, optarg,