Don't forget the -r on the second password prompt.

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

diff --git a/adduser/adduser.sh b/adduser/adduser.sh
index 2b6398af973b3cf26b4273a4edc0123069727e84..096e537bb1710fa3a50f35f095dffca7a491f690 100644 (file)
--- a/adduser/adduser.sh
+++ b/adduser/adduser.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2002 Michael Telahun Makonnen. All rights reserved.
+# Copyright (c) 2002, 2003 Michael Telahun Makonnen. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -10,8 +10,6 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -85,6 +83,7 @@ show_usage() {
        echo "  -N              do not read configuration file"
        echo "  -d              home directory"
        echo "  -f              file from which input will be received"
+       echo "  -g              default login group"
        echo "  -h              display this usage message"
        echo "  -k              path to skeleton home directory"
        echo "  -m              user welcome message file"
@@ -147,6 +146,7 @@ save_config() {
        echo "# NOTE: only *some* variables are saved." >> ${ADDUSERCONF}
        echo "# Last Modified on `${DATECMD}`."         >> ${ADDUSERCONF}
        echo ''                         >> ${ADDUSERCONF}
+       echo "defaultLgroup=$ulogingroup" >> ${ADDUSERCONF}
        echo "defaultclass=$uclass"     >> ${ADDUSERCONF}
        echo "defaultgroups=$ugroups"   >> ${ADDUSERCONF}
        echo "passwdtype=$passwdtype"   >> ${ADDUSERCONF}
@@ -432,25 +432,23 @@ get_class() {
 # get_logingroup
 #      Reads user's login group. Can be used in both interactive and batch
 #      modes. The specified value can be a group name or its numeric id.
-#      This routine leaves the field blank if nothing is provided. The pw(8)
-#      command will then provide a login group with the same name as the username.
+#      This routine leaves the field blank if nothing is provided and
+#      a default login group has not been set. The pw(8) command
+#      will then provide a login group with the same name as the username.
 #
 get_logingroup() {
-       ulogingroup=
+       ulogingroup="$defaultLgroup"
        _input=
 
-       # No need to take down a login group for a configuration saving run.
-       [ -n "$configflag" ] && return
-
        if [ -z "$fflag" ]; then
-               echo -n "Login group [$username]: "
+               echo -n "Login group [${ulogingroup:-$username}]: "
                read _input
        else
                _input="`echo "$fileline" | cut -f3 -d:`"
        fi
 
        # Pw(8) will use the username as login group if it's left empty
-       [ -n "$_input" ] && ulogingroup="$_input" || ulogingroup=
+       [ -n "$_input" ] && ulogingroup="$_input"
 }
 
 # get_groups
@@ -560,6 +558,8 @@ input_interactive() {
        _random="no"
        _emptypass="no"
        _usepass="yes"
+       _logingroup_ok="no"
+       _groups_ok="no"
        case $passwdtype in
        none)
                _emptypass="yes"
@@ -631,14 +631,14 @@ input_interactive() {
                                                ;;
                                        esac
                                        passwdtype="yes"
-                                       [ -n "$configrun" ] && break
+                                       [ -n "$configflag" ] && break
                                        trap 'stty echo; exit' 0 1 2 3 15
                                        stty -echo
                                        echo -n "Enter password: "
                                        read -r upass
                                        echo''
                                        echo -n "Enter password again: "
-                                       read _passconfirm
+                                       read -r _passconfirm
                                        echo ''
                                        stty echo
                                        # if user entered a blank password
@@ -713,7 +713,7 @@ input_interactive() {
        [ -z "$configflag" ] && printf "%-10s : %s\n" "Full Name" "$ugecos"
        [ -z "$configflag" ] && printf "%-10s : %s\n" "Uid" "$uuid"
        printf "%-10s : %s\n" "Class" "$uclass"
-       [ -z "$configflag" ] && printf "%-10s : %s %s\n" "Groups" "${ulogingroup:-$username}" "$ugroups"
+       printf "%-10s : %s %s\n" "Groups" "${ulogingroup:-$username}" "$ugroups"
        printf "%-10s : %s\n" "Home" "$uhome"
        printf "%-10s : %s\n" "Shell" "$ushell"
        printf "%-10s : %s\n" "Locked" "$_disable"
@@ -777,6 +777,7 @@ randompass=
 fileline=
 savedpwtype=
 defaultclass=
+defaultLgroup=
 defaultgoups=
 defaultshell="${DEFAULTSHELL}"
 
@@ -835,6 +836,10 @@ for _switch ; do
                fflag=yes
                shift; shift
                ;;
+       -g)
+               defaultLgroup="$2"
+               shift; shift
+               ;;
        -G)
                defaultgroups="$2"
                shift; shift
@@ -906,7 +911,11 @@ if [ -n "$fflag" ]; then
 else
        input_interactive
        while : ; do
-               echo -n "Add another user? (yes/no): "
+               if [ -z "$configflag" ]; then
+                       echo -n "Add another user? (yes/no): "
+               else
+                       echo -n "Re-edit the default configuration? (yes/no): "
+               fi
                read _input
                case $_input in
                [Yy][Ee][Ss]|[Yy][Ee]|[Yy])