--- loncom/Attic/lcuseradd 2000/10/30 02:42:17 1.9 +++ loncom/Attic/lcuseradd 2000/10/30 03:37:51 1.14 @@ -3,7 +3,8 @@ # lcuseradd # # Scott Harrison -# October 27, 2000 +# SH: October 27, 2000 +# SH: October 29, 2000 use strict; @@ -43,6 +44,20 @@ 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. This program needs 3 command-line arguments (username, password 1, password 2)."), +# (3,"Error. Three lines should be entered into standard input."), +# (4,"Error. Too many other simultaneous password change requests being made."), +# (5,"Error. User $username does not exist."), +# (6,"Error. Could not make www a member of the group \"$safeusername\"."), +# (7,"Error. Root was not successfully enabled.), +# (8,"Error. Cannot open /etc/passwd."), +# (9,"Error. The user name specified has invalid characters."), +# (10,"Error. A password entry had an invalid character."), +# (11,"Error. User already exists.), +# (12,"Error. Something went wrong with the addition of user \"$safeusername\"."), +# (13,"Error. Password mismatch."), # Security $ENV{'PATH'}=""; # Nullify path information. @@ -117,14 +132,14 @@ if ($pbad) { if (-e "/home/$safeusername") { print "Error. User already exists.\n" unless $noprint; unlink('/tmp/lock_lcpasswd'); - exit 8; + exit 11; } # Only add user if the two password arguments match. if ($password1 ne $password2) { print "Error. Password mismatch.\n" unless $noprint; unlink('/tmp/lock_lcpasswd'); - exit 7; + exit 13; } &enable_root_capability; @@ -135,7 +150,7 @@ if ($password1 ne $password2) { if (system('/usr/sbin/useradd','-c','LON-CAPA user',$safeusername)) { print "Error. Something went wrong with the addition of user \"$safeusername\".\n" unless $noprint; unlink('/tmp/lock_lcpasswd'); - exit 5; + exit 12; } # Make www a member of that user group. @@ -157,6 +172,7 @@ close IN; my ($userid,$useroldcryptpwd); my @F; my @U; for my $l (@lines) { + chop $l; @F=split(/\:/,$l); if ($F[0] eq $username) {($userid,$useroldcryptpwd)=($F[2],$F[1]); @U=@F;} } @@ -169,7 +185,7 @@ if (!defined($userid)) { } # Construct new password entry (random salt) -my $newcryptpwd=crypt($newpwd,(join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64])); +my $newcryptpwd=crypt($password1,(join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64])); $U[1]=$newcryptpwd; my $userline=join(':',@U); my $rootid=&enable_root_capability; @@ -205,18 +221,18 @@ unless ($smbexist) { close OUT; } open(OUT,"|/usr/bin/smbpasswd -s $safeusername>/dev/null"); -print OUT $newpwd; print OUT "\n"; -print OUT $newpwd; print OUT "\n"; +print OUT $password1; print OUT "\n"; +print OUT $password1; print OUT "\n"; close OUT; $<=$wwwid; # unfool the program # Make final modifications to the user directory. # Add a public_html file with a stand-in index.html file. -system('/bin/chmod','-R','0640',"/home/$safeusername"); -system('/bin/chmod','0750',"/home/$safeusername"); -mkdir "/home/$safeusername/public_html",0750; -open OUT,">/home/$safeusername/public_html"; +system('/bin/chmod','-R','0660',"/home/$safeusername"); +system('/bin/chmod','0770',"/home/$safeusername"); +mkdir "/home/$safeusername/public_html",0770; +open OUT,">/home/$safeusername/public_html/index.html"; print OUT< @@ -239,7 +255,10 @@ This area provides for: END close OUT; - +system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername"); +system('/bin/chmod','-R','0660',"/home/$safeusername"); +system('/bin/chmod','0770',"/home/$safeusername"); +system('/bin/chmod','0770',"/home/$safeusername/public_html"); &disable_root_capability; unlink('/tmp/lock_lcpasswd'); exit 0;