X-Git-Url: https://git.cameronkatri.com/pw-darwin.git/blobdiff_plain/d664473d0879712041d27892016371dcef1d2600..b0c53286ae634ab410a90cd6ec0372e9961ab406:/adduser/adduser.perl diff --git a/adduser/adduser.perl b/adduser/adduser.perl index b205901..dec26df 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.15 1996/08/27 20:04:34 wosch Exp $ +# $Id: adduser.perl,v 1.30 1997/05/01 23:23:06 ache Exp $ # read variables @@ -33,7 +33,7 @@ sub variables { $defaultpasswd = "yes"; # use password for new users $dotdir = "/usr/share/skel"; # copy dotfiles from this dir $dotdir_bak = $dotdir; - $send_message = "no"; # send message to new user + $send_message = "/etc/adduser.message"; # send message to new user $send_message_bak = '/etc/adduser.message'; $config = "/etc/adduser.conf"; # config file for adduser $config_read = 1; # read config file @@ -53,6 +53,7 @@ sub variables { $defaultshell = 'sh'; # defaultshell if not empty $group_uniq = 'USER'; $defaultgroup = $group_uniq;# login groupname, $group_uniq means username + $defaultclass = ''; $uid_start = 1000; # new users get this uid $uid_end = 32000; # max. uid @@ -245,6 +246,10 @@ sub passwd_read { while(

) { chop; push(@passwd_backup, $_); + # ignore comments + next if /^\s*$/; + next if /^\s*#/; + ($p_username, $pw, $p_uid, $p_gid, $sh) = (split(/:/, $_))[0..3,9]; print "$p_username already exists with uid: $username{$p_username}!\n" @@ -255,7 +260,7 @@ sub passwd_read { print "User $p_username: illegal shell: ``$sh''\n" if ($verbose && $sh && !$shell{&basename($sh)} && - $p_username !~ /^(bin|uucp|falcon|nobody)$/ && + $p_username !~ /^(news|xten|bin|nobody|uucp)$/ && $sh !~ /\/(pppd|sliplogin)$/); $uid{$p_uid} = $p_username; $pwgid{$p_gid} = $p_username; @@ -272,6 +277,10 @@ sub group_read { while() { chop; push(@group_backup, $_); + # ignore comments + next if /^\s*$/; + next if /^\s*#/; + ($g_groupname, $pw, $g_gid, $memb) = (split(/:/, $_))[0..3]; $groupmembers{$g_gid} = $memb; @@ -307,9 +316,9 @@ sub new_users_name { local($name); while(1) { - $name = &confirm_list("Enter username", 1, "a-z0-9", ""); - if (length($name) > 8) { - warn "Username is longer than 8 chars\a\n"; + $name = &confirm_list("Enter username", 1, "a-z0-9_-", ""); + if (length($name) > 16) { + warn "Username is longer than 16 chars\a\n"; next; } last if (&new_users_name_valid($name) eq $name); @@ -320,7 +329,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; @@ -383,6 +392,16 @@ sub new_users_id { return &next_id($name); } +# return login class for user +sub new_users_class { + local($def) = @_; + local($class); + + $class = &confirm_list("Enter login class:", 1, $def, ($def, "default")); + $class = "" if $class eq "default"; + return $class; +} + # add user to group sub add_group { local($gid, $name) = @_; @@ -520,10 +539,11 @@ sub new_users_ok { print < $crash") || die "Sorry, give up\n"; - $j = join("\n", @passwd_backup); - $j =~ s/\n//; - print R $j . "\n"; - close R; - - system("$pwd_mkdb $crash"); - die "Sorry, give up\n" if $?; - die "Successfully restore $etc_passwd. Exit.\n"; + warn "``$pwd_mkdb'' failed\n"; + exit($? >> 8); } } @@ -645,9 +655,21 @@ sub new_users_password { local($password); while(1) { + system("stty -echo"); $password = &confirm_list("Enter password", 1, "", ""); - last if $password ne ""; - last if &confirm_yn("Use an empty password?", "yes"); + system("stty echo"); + print "\n"; + if ($password ne "") { + system("stty -echo"); + $newpass = &confirm_list("Enter password again", 1, "", ""); + system("stty echo"); + print "\n"; + last if $password eq $newpass; + print "They didn't match, please try again\n"; + } + elsif (&confirm_yn("Use an empty password?", "yes")) { + last; + } } return $password; @@ -666,9 +688,10 @@ sub new_users { # sh: shell # u_id: user id # g_id: group id + # class: login class # group_login: groupname of g_id # new_groups: some other groups - local($name, $group_login, $fullname, $sh, $u_id, $g_id, $new_groups); + local($name, $group_login, $fullname, $sh, $u_id, $g_id, $class, $new_groups); local($groupmembers_bak, $cryptpwd); local($new_users_ok) = 1; @@ -681,6 +704,7 @@ sub new_users { $fullname = &new_users_fullname($name); $sh = &new_users_shell; ($u_id, $g_id) = &new_users_id($name); + $class = &new_users_class($defaultclass); ($group_login, $defaultgroup) = &new_users_grplogin($name, $defaultgroup, $new_users_ok); # do not use uniq username and login group @@ -697,7 +721,7 @@ sub new_users { $cryptpwd = crypt($password, &salt) if $password ne ""; # obscure perl bug $new_entry = "$name\:" . "$cryptpwd" . - "\:$u_id\:$g_id\::0:0:$fullname:$home/$name:$sh"; + "\:$u_id\:$g_id\:$class\:0:0:$fullname:$home/$name:$sh"; &append_file($etc_passwd, "$new_entry"); &new_users_pwdmkdb("$new_entry"); &new_users_group_update; @@ -717,7 +741,7 @@ sub new_users { } sub batch { - local($name, $groups, $fullname, $password) = @_; + local($name, $groups, $class, $fullname, $password) = @_; local($sh); $defaultshell = &shell_default_valid($defaultshell); @@ -734,11 +758,12 @@ sub batch { ($flag, $new_groups) = &new_users_groups_valid($groups); return 0 if $flag; + $class = $defaultclass if $class eq ""; $cryptpwd = ""; $cryptpwd = crypt($password, &salt) if $password ne ""; # obscure perl bug $new_entry = "$name\:" . "$cryptpwd" . - "\:$u_id\:$g_id\::0:0:$fullname:$home/$name:$sh"; + "\:$u_id\:$g_id\:$class\:0:0:$fullname:$home/$name:$sh"; &append_file($etc_passwd, "$new_entry"); &new_users_pwdmkdb("$new_entry"); &new_users_group_update; @@ -768,8 +793,9 @@ sub check_root { sub usage { warn <