summaryrefslogtreecommitdiff
path: root/usr.sbin/adduser
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-09 18:31:37 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-09 18:31:37 +0000
commitd0ad50eb8f516073ceaefae08e2cd521b9b8e1ea (patch)
treed7849baac10fa9e841e083e894472cb27f3eb100 /usr.sbin/adduser
parent30dcf7e82696ad7289cc953a043a05d80d068736 (diff)
31 vs 32; ianm@cit.uws.edu.au
Diffstat (limited to 'usr.sbin/adduser')
-rw-r--r--usr.sbin/adduser/adduser.84
-rw-r--r--usr.sbin/adduser/adduser.perl8
2 files changed, 6 insertions, 6 deletions
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);