summaryrefslogtreecommitdiffstats
path: root/adduser
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2002-01-02 16:19:14 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2002-01-02 16:19:14 +0000
commit53964bbf0386874c552be63350bba7d8aa82caba (patch)
tree7cabede30d691d5bf730cd6e7b04e067d9de48f6 /adduser
parentad3df1df7be99f6b798c6927e7b8917dbde5f497 (diff)
downloadpw-darwin-53964bbf0386874c552be63350bba7d8aa82caba.tar.gz
pw-darwin-53964bbf0386874c552be63350bba7d8aa82caba.tar.zst
pw-darwin-53964bbf0386874c552be63350bba7d8aa82caba.zip
Be consistent in what restriction is imposed on a username
in the code and what the warning message reads.
Diffstat (limited to 'adduser')
-rw-r--r--adduser/adduser.perl6
1 files changed, 4 insertions, 2 deletions
diff --git a/adduser/adduser.perl b/adduser/adduser.perl
index 421cf02..9084d22 100644
--- a/adduser/adduser.perl
+++ b/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;