From 9eeff78f2b54bf8f0329ab99d434e7bbe94bf071 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 30 Jul 2008 18:37:21 +0000 Subject: 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 --- adduser/rmuser.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'adduser/rmuser.sh') diff --git a/adduser/rmuser.sh b/adduser/rmuser.sh index d263217..6b09225 100644 --- a/adduser/rmuser.sh +++ b/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. -- cgit v1.2.3-56-ge451