--- loncom/lcuserdel	2000/10/29 22:20:43	1.8
+++ loncom/lcuserdel	2000/10/30 02:31:45	1.10
@@ -25,6 +25,11 @@ use strict;
 # Standard input usage
 # First line is USERNAME
 
+# Valid user names must consist of ascii
+# characters that are alphabetical characters
+# (A-Z,a-z), numeric (0-9), or the underscore
+# mark (_). (Essentially, the perl regex \w).
+
 # Command-line arguments [USERNAME]
 # Yes, but be very careful here (don't pass shell commands)
 # and this is only supported to allow perl-system calls.
@@ -35,6 +40,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 +85,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;
@@ -89,6 +101,11 @@ else {
 my ($username)=@input;
 $username=~/^(\w+)$/;
 my $safeusername=$1;
+if ($username ne $safeusername) {
+    print "Error. The user name specified has invalid characters.\n";
+    unlink('/tmp/lock_lcpasswd');
+    exit 9;
+}
 
 &enable_root_capability;