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

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

diff --git a/ChangeLog b/ChangeLog
index 6dd75a78e69e02375a901b5aa1547b12bd656f92..4029f38a3d21a69e609ee5a9b04a7597e87d850b 100644 (file)
--- 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

diff --git a/sshd.c b/sshd.c
index 427ca35455b46cd76cbf0b28344a213eab16464b..55c57e1955dd9dd5684fe9a85cdbed57c61d8af3 100644 (file)
--- 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,