The original adduser/rmuser scripts in Perl used to modify the PATH

setting.  When the scripts were converted to Bourne shell, this was
removed.  The adduser script was changed to use an explicit path for
the pw(8) command so that /usr/sbin did not have to be in the user's
PATH.  The rmuser script continued to assume that /usr/sbin was in the
user's path, however.  This fixes the rmuser script to use an explicit
path for pw(8) similar to adduser.

MFC after:	2 weeks
This commit is contained in:
John Baldwin 2008-07-30 18:37:21 +00:00
parent 24bbc85bf6
commit 662c90c800
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=181006

View file

@ -33,6 +33,7 @@ MAILSPOOL="/var/mail"
SIGKILL="-KILL"
TEMPDIRS="/tmp /var/tmp"
THISCMD=`/usr/bin/basename $0`
PWCMD="${PWCMD:-/usr/sbin/pw}"
# err msg
# Display $msg on stderr.
@ -178,7 +179,7 @@ rm_user() {
}
! verbose && echo -n " passwd"
verbose && echo -n " from the system:"
pw userdel -n $login $pw_rswitch
${PWCMD} userdel -n $login $pw_rswitch
verbose && echo ' Done.'
}
@ -343,7 +344,7 @@ for _user in $userlist ; do
fi
# Disable any further attempts to log into this account
pw 2>/dev/null lock $_user
${PWCMD} 2>/dev/null lock $_user
# Remove crontab, mail spool, etc. Then obliterate the user from
# the passwd and group database.