--- loncom/lcuserdel	2000/10/29 17:57:26	1.5
+++ loncom/lcuserdel	2000/10/29 22:38:21	1.9
@@ -35,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.
@@ -75,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;
@@ -95,17 +102,20 @@ 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
-system('/usr/sbin/userdel',$safeusername); # ignore error message
-system('/usr/sbin/groupdel',$safeusername); # ignore error message
+# 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`;
 my $newsmbpasswd=`/bin/grep -v '^${safeusername}:' /etc/smbpasswd`;
 
 if ($oldsmbpasswd ne $newsmbpasswd) {
-open OUT,">/etc/smbpasswd";
-print OUT $newsmbpasswd;
-close OUT;
+    open OUT,">/etc/smbpasswd";
+    print OUT $newsmbpasswd;
+    close OUT;
+}
 
 # Change ownership on directory from username:username to www:www
 # This prevents subsequently added users from having access.