[Midnightbsd-cvs] src [11413] trunk/usr.sbin/adduser/rmuser.sh: add pwcmd path

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jul 6 22:28:20 EDT 2018


Revision: 11413
          http://svnweb.midnightbsd.org/src/?rev=11413
Author:   laffer1
Date:     2018-07-06 22:28:19 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
add pwcmd path

Modified Paths:
--------------
    trunk/usr.sbin/adduser/rmuser.sh

Property Changed:
----------------
    trunk/usr.sbin/adduser/rmuser.sh

Modified: trunk/usr.sbin/adduser/rmuser.sh
===================================================================
--- trunk/usr.sbin/adduser/rmuser.sh	2018-07-07 02:25:09 UTC (rev 11412)
+++ trunk/usr.sbin/adduser/rmuser.sh	2018-07-07 02:28:19 UTC (rev 11413)
@@ -24,9 +24,8 @@
 #
 #	Email: Mike Makonnen <mtm at FreeBSD.Org>
 #
+# $FreeBSD: stable/10/usr.sbin/adduser/rmuser.sh 181006 2008-07-30 18:37:21Z jhb $
 # $MidnightBSD$
-# $FreeBSD: src/usr.sbin/adduser/rmuser.sh,v 1.9.10.1 2007/10/19 07:46:33 mtm Exp $
-#
 
 ATJOBDIR="/var/at/jobs"
 CRONJOBDIR="/var/cron/tabs"
@@ -34,6 +33,7 @@
 SIGKILL="-KILL"
 TEMPDIRS="/tmp /var/tmp"
 THISCMD=`/usr/bin/basename $0`
+PWCMD="${PWCMD:-/usr/sbin/pw}"
 
 # err msg
 #	Display $msg on stderr.
@@ -179,7 +179,7 @@
 	}
 	! 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.'
 }
 
@@ -344,7 +344,7 @@
 	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.


Property changes on: trunk/usr.sbin/adduser/rmuser.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list