31 vs 32; ianm@cit.uws.edu.au

3 files changed, 9 insertions, 9 deletions

diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index 1aa93caba8b..65aed77b675 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getlogin.2,v 1.10 2001/02/01 01:43:24 deraadt Exp $
+.\"	$OpenBSD: getlogin.2,v 1.11 2001/04/09 18:31:35 deraadt Exp $
 .\"	$NetBSD: getlogin.2,v 1.4 1995/02/27 12:33:03 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -96,10 +96,10 @@ The
 parameter
 pointed to a string that was too long.
 Login names are limited to
-.Dv MAXLOGNAME
+.Dv MAXLOGNAME-1
 (from
 .Ao Pa sys/param.h Ac )
-characters, currently 32.
+characters, currently 31.
 .It Bq Er EPERM
 The caller tried to set the login name and was not the superuser.
 .El
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 38dded701c2..02855811f30 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser.8,v 1.20 2001/01/31 21:12:58 chris Exp $
+.\"	$OpenBSD: adduser.8,v 1.21 2001/04/09 18:31:36 deraadt Exp $
 .\"
 .\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -209,7 +209,7 @@ politely refuses to remove users whose UID is 0 (typically root).
 .Bl -tag -width Ds
 .It Sy username
 Login names should contain only lowercase characters or digits.
-They should be no longer than 32 characters (see BUGS section of
+They should be no longer than 31 characters (see BUGS section of
 .Xr setlogin 2 ) .
 .\" The reasons for this limit are "Historical".
 .\" Given that people have traditionally wanted to break this
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl
index 65234401254..44ee406727f 100644
--- a/usr.sbin/adduser/adduser.perl
+++ b/usr.sbin/adduser/adduser.perl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#	$OpenBSD: adduser.perl,v 1.28 2001/01/31 21:12:58 chris Exp $
+#	$OpenBSD: adduser.perl,v 1.29 2001/04/09 18:31:36 deraadt Exp $
 #
 # Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 # All rights reserved.
@@ -89,7 +89,7 @@ sub variables {
     $group = "/etc/group";
     $pwd_mkdb = "pwd_mkdb -p";	# program for building passwd database
     $encryptionmethod = "blowfish";
-    $rcsid = '$OpenBSD: adduser.perl,v 1.28 2001/01/31 21:12:58 chris Exp $';
+    $rcsid = '$OpenBSD: adduser.perl,v 1.29 2001/04/09 18:31:36 deraadt Exp $';
 
     # List of directories where shells located
     @path = ('/bin', '/usr/bin', '/usr/local/bin');
@@ -366,8 +366,8 @@ sub new_users_name {
 
     while(1) {
 	$name = &confirm_list("Enter username", 1, "a-z0-9_-", "");
-	if (length($name) > 32) {
-	    warn "Username is longer than 32 characters\a\n";
+	if (length($name) > 31) {
+	    warn "Username is longer than 31 characters\a\n";
 	    next;
 	}
 	last if (&new_users_name_valid($name) eq $name);