In the description of the password field, -w was meant, not the

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

diff --git a/adduser/adduser.sh b/adduser/adduser.sh
index 735d178c1aefbd8ee78a895ccf369f3d5ec46fb0..3d1d6f85cebcb89a33e161ab74fa5d89a07ba33a 100644 (file)
--- a/adduser/adduser.sh
+++ b/adduser/adduser.sh
@@ -81,6 +81,7 @@ show_usage() {
        echo "  -E              disable this account after creation"
        echo "  -G              additional groups to add accounts to"
        echo "  -L              login class of the user"
+       echo "  -M              file permission for home directory"
        echo "  -N              do not read configuration file"
        echo "  -S              a nonexistent shell is not an error"
        echo "  -d              home directory"
@@ -190,6 +191,7 @@ save_config() {
        echo "# NOTE: only *some* variables are saved." >> ${ADDUSERCONF}
        echo "# Last Modified on `${DATECMD}`."         >> ${ADDUSERCONF}
        echo ''                         >> ${ADDUSERCONF}
+       echo "defaultHomePerm=$uhomeperm" >> ${ADDUSERCONF}
        echo "defaultLgroup=$ulogingroup" >> ${ADDUSERCONF}
        echo "defaultclass=$uclass"     >> ${ADDUSERCONF}
        echo "defaultgroups=$ugroups"   >> ${ADDUSERCONF}
@@ -199,6 +201,7 @@ save_config() {
        echo "udotdir=$udotdir"         >> ${ADDUSERCONF}
        echo "msgfile=$msgfile"         >> ${ADDUSERCONF}
        echo "disableflag=$disableflag" >> ${ADDUSERCONF}
+       echo "uidstart=$uidstart"       >> ${ADDUSERCONF}
 }
 
 # add_user
@@ -246,7 +249,12 @@ add_user() {
                if [ "$uhome" = "$NOHOME" ]; then
                        _home='-d "$uhome"'
                else
-                       _home='-m -d "$uhome"'
+                       # Use home directory permissions if specified
+                       if [ -n "$uhomeperm" ]; then
+                               _home='-m -d "$uhome" -M "$uhomeperm"'
+                       else
+                               _home='-m -d "$uhome"'
+                       fi
                fi
        elif [ -n "$Dflag" -a -n "$uhome" ]; then
                _home='-d "$uhome"'
@@ -346,13 +354,19 @@ get_user() {
                        _input="`echo "$fileline" | cut -f1 -d:`"
                fi
 
-               # There *must* be a username. If this is an interactive
-               # session give the user an opportunity to retry.
+               # There *must* be a username, and it must not exist. If
+               # this is an interactive session give the user an
+               # opportunity to retry.
                #
                if [ -z "$_input" ]; then
                        err "You must enter a username!"
                        [ -z "$fflag" ] && continue
                fi
+               ${PWCMD} usershow $_input > /dev/null 2>&1
+               if [ "$?" -eq 0 ]; then
+                       err "User exists!"
+                       [ -z "$fflag" ] && continue
+               fi
                break
        done
        username="$_input"
@@ -442,21 +456,38 @@ get_homedir() {
        fi
 }
 
+# get_homeperm
+#      Reads the account's home directory permissions.
+#
+get_homeperm() {
+       uhomeperm=$defaultHomePerm
+       _input=
+       _prompt=
+
+       if [ -n "$uhomeperm" ]; then
+               _prompt="Home directory permissions [${uhomeperm}]: "
+       else
+               _prompt="Home directory permissions (Leave empty for default): "
+       fi
+       if [ -z "$fflag" ]; then
+               echo -n "$_prompt"
+               read _input
+       fi
+
+       if [ -n "$_input" ]; then
+               uhomeperm="$_input"
+       fi
+}
+
 # get_uid
 #      Reads a numeric userid in an interactive or batch session. Automatically
 #      allocates one if it is not specified.
 #
 get_uid() {
-       if [ -z "$uuid" ]; then
-               uuid=${uidstart}
-       fi
-
+       uuid=${uidstart}
        _input=
        _prompt=
 
-       # No need to take down uids for a configuration saving run.
-       [ -n "$configflag" ] && return
-
        if [ -n "$uuid" ]; then
                _prompt="Uid [$uuid]: "
        else
@@ -592,19 +623,22 @@ input_from_file() {
                case "$fileline" in
                \#*|'')
                        ;;
-               esac
-
-               get_user || continue
-               get_gecos
-               get_uid
-               get_logingroup
-               get_class
-               get_shell
-               get_homedir
-               get_password
-               get_expire_dates
+               *)
+                       get_user || continue
+                       get_gecos
+                       get_uid
+                       get_logingroup
+                       get_class
+                       get_shell
+                       get_homedir
+                       get_homeperm
+                       get_password
+                       get_expire_dates
+                       ugroups="$defaultgroups"
 
-               add_user
+                       add_user
+                       ;;
+               esac
        done
 }
 
@@ -667,6 +701,7 @@ input_interactive() {
        get_class
        get_shell
        get_homedir
+       get_homeperm
 
        while : ; do
                echo -n "Use password-based authentication? [$_usepass]: "
@@ -777,6 +812,7 @@ input_interactive() {
        printf "%-10s : %s\n" "Class" "$uclass"
        printf "%-10s : %s %s\n" "Groups" "${ulogingroup:-$username}" "$ugroups"
        printf "%-10s : %s\n" "Home" "$uhome"
+       printf "%-10s : %s\n" "Home Mode" "$uhomeperm"
        printf "%-10s : %s\n" "Shell" "$ushell"
        printf "%-10s : %s\n" "Locked" "$_disable"
        while : ; do
@@ -821,6 +857,7 @@ ugecos=
 ulogingroup=
 uclass=
 uhome=
+uhomeperm=
 upass=
 ushell=
 udotdir=/usr/share/skel
@@ -847,6 +884,7 @@ defaultclass=
 defaultLgroup=
 defaultgroups=
 defaultshell="${DEFAULTSHELL}"
+defaultHomePerm=
 
 # Make sure the user running this program is root. This isn't a security
 # measure as much as it is a usefull method of reminding the user to
@@ -935,6 +973,10 @@ for _switch ; do
                esac
                shift; shift
                ;;
+       -M)
+               defaultHomePerm=$2
+               shift; shift
+               ;;
        -N)
                readconfig=
                shift