summaryrefslogtreecommitdiffstats
path: root/usr.sbin/adduser
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2008-07-30 18:37:21 +0000
committerjhb <jhb@FreeBSD.org>2008-07-30 18:37:21 +0000
commit95fe9af01ee322d9b50b26c9d1f614e4d03da069 (patch)
tree443f9005d9fdc8353b3276443890a282fcb490b7 /usr.sbin/adduser
parent85be7d90931f1721d90ba92387c99e9dd6f5ebec (diff)
downloadFreeBSD-src-95fe9af01ee322d9b50b26c9d1f614e4d03da069.zip
FreeBSD-src-95fe9af01ee322d9b50b26c9d1f614e4d03da069.tar.gz
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
Diffstat (limited to 'usr.sbin/adduser')
-rw-r--r--usr.sbin/adduser/rmuser.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh
index d263217..6b09225 100644
--- a/usr.sbin/adduser/rmuser.sh
+++ b/usr.sbin/adduser/rmuser.sh
@@ -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.
OpenPOWER on IntegriCloud