diff options
author | yar <yar@FreeBSD.org> | 2002-01-28 17:59:09 +0000 |
---|---|---|
committer | yar <yar@FreeBSD.org> | 2002-01-28 17:59:09 +0000 |
commit | 0355f3828ee06b97a197b8b18321ae6dfdf5d103 (patch) | |
tree | 303d12cb794aa6d999f25579be45d34e9838a89b /usr.sbin/adduser | |
parent | 261a4fd963a7c4766c3b74218b1e2d9f4d567ee9 (diff) | |
download | FreeBSD-src-0355f3828ee06b97a197b8b18321ae6dfdf5d103.zip FreeBSD-src-0355f3828ee06b97a197b8b18321ae6dfdf5d103.tar.gz |
Keep similar things together: Check for too long usernames
inside the function that verifies username validity.
Diffstat (limited to 'usr.sbin/adduser')
-rw-r--r-- | usr.sbin/adduser/adduser.perl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index 2aa9c31..322bac6 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/adduser/adduser.perl @@ -317,10 +317,6 @@ sub new_users_name { while(1) { $name = &confirm_list("Enter username", 1, $usernameregexp, ""); - if (length($name) > 16) { - warn "Username is longer than 16 chars\a\n"; - next; - } last if (&new_users_name_valid($name)); } return $name; @@ -332,6 +328,9 @@ sub new_users_name_valid { if ($name eq $usernameregexp) { # user/admin just pressed <Return> warn "Please enter a username\a\n"; return 0; + } elsif (length($name) > 16) { + warn "Username is longer than 16 characters.\a\n"; + return 0; } elsif ($name =~ /[:\n]/) { warn "Username cannot contain colon or newline characters.\a\n"; return 0; |