--- loncom/lcuserdel	2000/10/28 18:25:47	1.3
+++ loncom/lcuserdel	2000/10/29 22:07:20	1.7
@@ -3,8 +3,9 @@
 # lcuserdel
 #
 # Scott Harrison
-# October 27, 2000
-# October 28, 2000
+# SH: October 27, 2000
+# SH: October 28, 2000
+# SH: October 29, 2000
 
 use strict;
 
@@ -12,6 +13,11 @@ use strict;
 # be run by user 'www'.  It DOES NOT delete directories.
 # All it does is remove a user's entries from
 # /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).
 
 # This script works under the same process control mechanism
 # as lcuseradd and lcpasswd, to make sure that only one of these
@@ -81,6 +87,33 @@ else {
     map {chop} @input;
 }
 
+my ($username)=@input;
+$username=~/^(\w+)$/;
+my $safeusername=$1;
+
+&enable_root_capability;
+
+# 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/groupdel 2>/dev/null',$safeusername); # ignore error message
+system('/usr/sbin/userdel 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;
+}
+
+# Change ownership on directory from username:username to www:www
+# This prevents subsequently added users from having access.
+
+system('/bin/chown','-R','www:www',"/home/$safeusername");
+
 &disable_root_capability;
 unlink("/tmp/lock_lcpasswd");
 exit 0;