summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtm <mtm@FreeBSD.org>2003-03-19 08:07:15 +0000
committermtm <mtm@FreeBSD.org>2003-03-19 08:07:15 +0000
commita2cbf4fe43cc6277ee36f49d3c69d72217c3a028 (patch)
tree7667ee39551fa093562126dacd9dfd1f7f31bac5
parente63e5ae33641e7906245d09be07d1e6e572f0b12 (diff)
downloadFreeBSD-src-a2cbf4fe43cc6277ee36f49d3c69d72217c3a028.zip
FreeBSD-src-a2cbf4fe43cc6277ee36f49d3c69d72217c3a028.tar.gz
o initialize a couple of local flags so the user can re-edit groups
next time the subroutine is re-entered o s/configrun/configflag/ o Make the prompt make sense if the user was creating a configuration file Approved by: markm (mentor)(implicit)
-rw-r--r--usr.sbin/adduser/adduser.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index 3b843c6..79e3752 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -558,6 +558,8 @@ input_interactive() {
_random="no"
_emptypass="no"
_usepass="yes"
+ _logingroup_ok="no"
+ _groups_ok="no"
case $passwdtype in
none)
_emptypass="yes"
@@ -629,7 +631,7 @@ 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: "
@@ -904,7 +906,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])
OpenPOWER on IntegriCloud