diff options
| author | Wolfram Schneider <wosch@FreeBSD.org> | 1996-12-29 21:56:31 +0000 |
|---|---|---|
| committer | Wolfram Schneider <wosch@FreeBSD.org> | 1996-12-29 21:56:31 +0000 |
| commit | d8f99db12f55e1f07f7eb60a408904a29aa56d65 (patch) | |
| tree | e9fde85ad04ad8a55dfae38918f6a270bd846b4a /adduser/adduser.perl | |
| parent | 77f867733f1e90fa723677dada8e2b5914bbb57c (diff) | |
| download | pw-darwin-d8f99db12f55e1f07f7eb60a408904a29aa56d65.tar.gz pw-darwin-d8f99db12f55e1f07f7eb60a408904a29aa56d65.zip | |
Allow dash `-' (except for first char) and underscore `_' in usernames.
pointed out by: max
Diffstat (limited to 'adduser/adduser.perl')
| -rw-r--r-- | adduser/adduser.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adduser/adduser.perl b/adduser/adduser.perl index 98ed4a5..42a1c5e 100644 --- a/adduser/adduser.perl +++ b/adduser/adduser.perl @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: adduser.perl,v 1.23 1996/12/23 00:10:19 mpp Exp $ +# $Id: adduser.perl,v 1.24 1996/12/29 15:06:52 wosch Exp $ # read variables @@ -307,7 +307,7 @@ sub new_users_name { local($name); while(1) { - $name = &confirm_list("Enter username", 1, "A-Za-z0-9_", ""); + $name = &confirm_list("Enter username", 1, "a-z0-9_-", ""); if (length($name) > 16) { warn "Username is longer than 16 chars\a\n"; next; @@ -320,7 +320,7 @@ sub new_users_name { sub new_users_name_valid { local($name) = @_; - if ($name !~ /^[a-z0-9]+$/) { + if ($name !~ /^[a-z0-9_][a-z0-9_\-]*$/) { warn "Wrong username. " . "Please use only lowercase characters or digits\a\n"; return 0; |