--- loncom/lcpasswd 2005/04/07 22:27:52 1.21
+++ loncom/lcpasswd 2010/10/12 10:33:47 1.22
@@ -7,7 +7,7 @@
# YEAR=2002
# 02/19 Matthew Hall
#
-# $Id: lcpasswd,v 1.21 2005/04/07 22:27:52 albertel Exp $
+# $Id: lcpasswd,v 1.22 2010/10/12 10:33:47 foxr Exp $
###
###############################################################################
@@ -92,15 +92,15 @@ print "In lcpasswd" unless $noprint;
# ----------------------------- Make sure this process is running from user=www
my $wwwid=getpwnam('www');
-&disable_root_capability;
-if ($wwwid!=$>) {
+
+if ($wwwid!=$<) {
print("User ID mismatch. This program must be run as user 'www'\n")
unless $noprint;
exit 1;
}
# ----------------------------------- Start running script with www permissions
-&disable_root_capability;
+
# --------------------------- Handle case of another lcpasswd process (locking)
unless (&try_to_lock('/tmp/lock_lcpasswd')) {
@@ -190,7 +190,7 @@ if (-e '/usr/bin/smbpasswd') {
print "smbpasswd done" unless $noprint;
}
-&disable_root_capability;
+
unlink('/tmp/lock_lcpasswd');
exit 0;
@@ -222,10 +222,7 @@ sub try_to_lock {
my ($lockfile)=@_;
my $currentpid;
my $lastpid;
- # Do not manipulate lock file as root
- if ($>==0) {
- return 0;
- }
+
# Try to generate lock file.
# Wait 3 seconds. If same process id is in
# lock file, then assume lock file is stale, and
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.