diff options
author | yar <yar@FreeBSD.org> | 2002-01-02 16:19:14 +0000 |
---|---|---|
committer | yar <yar@FreeBSD.org> | 2002-01-02 16:19:14 +0000 |
commit | 205784642b3c46f1f017271c18a02c23a15089b8 (patch) | |
tree | 9bc2f080b5119f1e5cf67b0200a94401ebb09e9b | |
parent | fdbb34839291be2fddb0785c794ad654928bbb0f (diff) | |
download | FreeBSD-src-205784642b3c46f1f017271c18a02c23a15089b8.zip FreeBSD-src-205784642b3c46f1f017271c18a02c23a15089b8.tar.gz |
Be consistent in what restriction is imposed on a username
in the code and what the warning message reads.
-rw-r--r-- | usr.sbin/adduser/adduser.perl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index 421cf02..9084d22 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/adduser/adduser.perl @@ -328,8 +328,10 @@ sub new_users_name_valid { local($name) = @_; if ($name !~ /^[a-z0-9_][a-z0-9_\-]*$/ || $name eq "a-z0-9_-") { - warn "Wrong username. " . - "Please use only lowercase characters or digits\a\n"; + warn "Illegal username.\n" . + "Please use only lowercase Roman, decimal, underscore, " . + "or hyphen characters.\n" . + "Additionally, a username should not start with a hyphen.\a\n"; return 0; } elsif ($username{$name}) { warn "Username ``$name'' already exists!\a\n"; return 0; |