--- loncom/lcuserdel	2000/10/29 22:07:20	1.7
+++ loncom/lcuserdel	2000/10/29 22:38:21	1.9
@@ -15,7 +15,6 @@ use strict;
 # /etc/passwd, /etc/groups, and /etc/smbpasswd.
 # It also disables user directory access by making the directory
 # to be owned by user=www (as opposed to the former "username").
-# It also removes group membership from www (via the groupdel command).
 # This command only returns an error if it is
 # invoked incorrectly (by passing bad command-line arguments, etc).
 
@@ -36,6 +35,11 @@ use strict;
 # print "uh-oh" if $exitcode;
 
 # These are the exit codes.
+# ( (0,"ok"),
+#   (1,"User ID mismatch.  This program must be run as user 'www'"),
+#   (2,"Error. Too many other simultaneous password change requests being made."),
+#   (3,"Error. Only one line should be entered into standard input."),
+#   (4,"Error. This program needs just 1 command-line argument (username).") )
 
 # Security
 $ENV{'PATH'}=""; # Nullify path information.
@@ -76,12 +80,14 @@ if (@ARGV==1) {
 }
 elsif (@ARGV) {
     print("Error. This program needs just 1 command-line argument (username).\n") unless $noprint;
+    unlink('/tmp/lock_lcpasswd');
     exit 2;
 }
 else {
     @input=<>;
     if (@input!=1) {
 	print("Error. Only one line should be entered into standard input.\n") unless $noprint;
+	unlink('/tmp/lock_lcpasswd');
 	exit 3;
     }
     map {chop} @input;
@@ -96,8 +102,10 @@ my $safeusername=$1;
 # By using the system userdel command:
 # Remove entry from /etc/passwd if it exists
 # Remove entry from /etc/groups if it exists
+# I surround with groupdel command to make absolutely sure the group definition disappears.
 system('/usr/sbin/groupdel 2>/dev/null',$safeusername); # ignore error message
 system('/usr/sbin/userdel 2>/dev/null',$safeusername); # ignore error message
+system('/usr/sbin/groupdel 2>/dev/null',$safeusername); # ignore error message
 
 # Remove entry from /etc/smbpasswd if it exists
 my $oldsmbpasswd=`/bin/cat /etc/smbpasswd`;