Change "no" answer to "default" for login class, because "no" class

[pw-darwin.git] / adduser / adduser.perl

diff --git a/adduser/adduser.perl b/adduser/adduser.perl
index 8e35578dbb0cd65152459144bce0f3d55a0def8b..dec26dfc8eef155ab62461f65bcb0d5612add60a 100644 (file)
--- 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.
 #
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #

-# $Id: adduser.perl,v 1.17 1996/09/11 08:36:54 jkh Exp $
+# $Id: adduser.perl,v 1.30 1997/05/01 23:23:06 ache Exp $

 
 
 # read variables
 
 
 # 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;
     $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
     $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
     $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
 
     $uid_start = 1000;         # new users get this uid
     $uid_end   = 32000;                # max. uid


@@ -245,6 +246,10 @@ sub passwd_read {
     while(<P>) {
        chop;
        push(@passwd_backup, $_);
     while(<P>) {
        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"
        ($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)} &&
        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;
                $sh !~ /\/(pppd|sliplogin)$/);
        $uid{$p_uid} = $p_username;
        $pwgid{$p_gid} = $p_username;


@@ -272,6 +277,10 @@ sub group_read {
     while(<G>) {
        chop;
        push(@group_backup, $_);
     while(<G>) {
        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;
        ($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) {
     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);
            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) = @_;
 
 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;
        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 &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) = @_;
 # add user to group
 sub add_group {
     local($gid, $name) = @_;


@@ -524,6 +543,7 @@ Password: ****
 Fullname: $fullname
 Uid:     $u_id
 Gid:     $g_id ($group_login)
 Fullname: $fullname
 Uid:     $u_id
 Gid:     $g_id ($group_login)

+Class:   $class

 Groups:          $group_login $new_groups
 HOME:    $home/$name
 Shell:   $sh
 Groups:          $group_login $new_groups
 HOME:    $home/$name
 Shell:   $sh


@@ -668,9 +688,10 @@ sub new_users {
     # sh: shell
     # u_id: user id
     # g_id: group id
     # sh: shell
     # u_id: user id
     # g_id: group id

+    # class: login class

     # group_login: groupname of g_id
     # new_groups: some other groups
     # 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;
 
     local($groupmembers_bak, $cryptpwd);
     local($new_users_ok) = 1;
 


@@ -683,6 +704,7 @@ sub new_users {
        $fullname = &new_users_fullname($name);
        $sh = &new_users_shell;
        ($u_id, $g_id) = &new_users_id($name);
        $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
        ($group_login, $defaultgroup) =
            &new_users_grplogin($name, $defaultgroup, $new_users_ok);
        # do not use uniq username and login group


@@ -699,7 +721,7 @@ sub new_users {
            $cryptpwd = crypt($password, &salt) if $password ne "";
            # obscure perl bug
            $new_entry = "$name\:" . "$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;
            &append_file($etc_passwd, "$new_entry");
            &new_users_pwdmkdb("$new_entry");
            &new_users_group_update;


@@ -719,7 +741,7 @@ sub new_users {
 }
 
 sub batch {
 }
 
 sub batch {

-    local($name, $groups, $fullname, $password) = @_;
+    local($name, $groups, $class, $fullname, $password) = @_;

     local($sh);
 
     $defaultshell = &shell_default_valid($defaultshell);
     local($sh);
 
     $defaultshell = &shell_default_valid($defaultshell);


@@ -736,11 +758,12 @@ sub batch {
     ($flag, $new_groups) = &new_users_groups_valid($groups);
     return 0 if $flag;
 
     ($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" .
     $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;
     &append_file($etc_passwd, "$new_entry");
     &new_users_pwdmkdb("$new_entry");
     &new_users_group_update;


@@ -770,8 +793,9 @@ sub check_root {
 sub usage {
     warn <<USAGE;
 usage: adduser
 sub usage {
     warn <<USAGE;
 usage: adduser

-    [-batch username [group[,group]...] [fullname] [password]]
+    [-batch username [group[,group]...] [class] [fullname] [password]]

     [-check_only]
     [-check_only]

+    [-class login_class]

     [-config_create]
     [-dotdir dotdir]
     [-group login_group]
     [-config_create]
     [-dotdir dotdir]
     [-group login_group]


@@ -780,12 +804,12 @@ usage: adduser
     [-message message_file]
     [-noconfig]
     [-shell shell]
     [-message message_file]
     [-noconfig]
     [-shell shell]

-    [-s|-silent|-q|-quit]
+    [-s|-silent|-q|-quiet]

     [-uid uid_start]
     [-v|-verbose]
 
 home=$home shell=$defaultshell dotdir=$dotdir login_group=$defaultgroup
     [-uid uid_start]
     [-v|-verbose]
 
 home=$home shell=$defaultshell dotdir=$dotdir login_group=$defaultgroup

-message_file=$send_message uid_start=$uid_start
+login_class=$defaultclass message_file=$send_message uid_start=$uid_start

 USAGE
     exit 1;
 }
 USAGE
     exit 1;
 }


@@ -845,19 +869,20 @@ sub parse_arguments {
        shift @argv;
        last if /^--$/;
        if    (/^--?(v|verbose)$/)      { $verbose = 1 }
        shift @argv;
        last if /^--$/;
        if    (/^--?(v|verbose)$/)      { $verbose = 1 }

-       elsif (/^--?(s|silent|q|quit)$/)  { $verbose = 0 }
+       elsif (/^--?(s|silent|q|quiet)$/)  { $verbose = 0 }

        elsif (/^--?(debug)$/)      { $verbose = 2 }
        elsif (/^--?(h|help|\?)$/)      { &usage }
        elsif (/^--?(home)$/)    { $home = $argv[0]; shift @argv }
        elsif (/^--?(shell)$/)   { $defaultshell = $argv[0]; shift @argv }
        elsif (/^--?(dotdir)$/)  { $dotdir = $argv[0]; shift @argv }
        elsif (/^--?(uid)$/)     { $uid_start = $argv[0]; shift @argv }
        elsif (/^--?(debug)$/)      { $verbose = 2 }
        elsif (/^--?(h|help|\?)$/)      { &usage }
        elsif (/^--?(home)$/)    { $home = $argv[0]; shift @argv }
        elsif (/^--?(shell)$/)   { $defaultshell = $argv[0]; shift @argv }
        elsif (/^--?(dotdir)$/)  { $dotdir = $argv[0]; shift @argv }
        elsif (/^--?(uid)$/)     { $uid_start = $argv[0]; shift @argv }

+       elsif (/^--?(class)$/)   { $defaultclass = $argv[0]; shift @argv }

        elsif (/^--?(group)$/)   { $defaultgroup = $argv[0]; shift @argv }
        elsif (/^--?(check_only)$/) { $check_only = 1 }
        elsif (/^--?(message)$/) { $send_message = $argv[0]; shift @argv;
                                   $sendmessage = 1; }
        elsif (/^--?(batch)$/)   {
        elsif (/^--?(group)$/)   { $defaultgroup = $argv[0]; shift @argv }
        elsif (/^--?(check_only)$/) { $check_only = 1 }
        elsif (/^--?(message)$/) { $send_message = $argv[0]; shift @argv;
                                   $sendmessage = 1; }
        elsif (/^--?(batch)$/)   {

-           @batch = splice(@argv, 0, 4); $verbose = 0;
+           @batch = splice(@argv, 0, 5); $verbose = 0;

            die "batch: too few arguments\n" if $#batch < 0;
        }
        # see &config_read
            die "batch: too few arguments\n" if $#batch < 0;
        }
        # see &config_read


@@ -1177,8 +1202,8 @@ sub message_create {
 
 \$fullname,
 
 
 \$fullname,
 

-your account ``\$name'' was created. Your password is ``\$password''.
-Please expire your password. Have fun!
+your account ``\$name'' was created.
+Have fun!

 
 See also chpass(1), finger(1), passwd(1)
 EOF
 
 See also chpass(1), finger(1), passwd(1)
 EOF


@@ -1347,9 +1372,12 @@ shellpref = ($shpref)
 # defaultshell if not empty ("bash")
 defaultshell = "$defaultshell"
 
 # defaultshell if not empty ("bash")
 defaultshell = "$defaultshell"
 

-# defaultgroup ('USER' for same as username or any other valid group
+# defaultgroup ('USER' for same as username or any other valid group)

 defaultgroup = $defaultgroup
 
 defaultgroup = $defaultgroup
 

+# defaultclass if not empty
+defaultclass = "$defaultclass"
+

 # new users get this uid (1000)
 uid_start = 1000
 
 # new users get this uid (1000)
 uid_start = 1000