--- loncom/Attic/lcuseradd 2005/01/26 10:38:13 1.33 +++ loncom/Attic/lcuseradd 2005/01/26 12:13:58 1.34 @@ -6,7 +6,7 @@ # with adding a user with filesystem privileges (e.g. author) # # -# $Id: lcuseradd,v 1.33 2005/01/26 10:38:13 foxr Exp $ +# $Id: lcuseradd,v 1.34 2005/01/26 12:13:58 foxr Exp $ ### ############################################################################### @@ -219,7 +219,7 @@ if($error_file) { # user, however that disallows authentication changes from i # internal->fs.. so just check the passwd file instead. # -my $not_found = system("grep -q $safeusername: /etc/passwd"); +my $not_found = system("cut -d: -f1 /etc/passwd | grep -q \"^$safeusername\$\" "); if (!$not_found) { print "Error user already exists\n" unless $noprint; unlink('/tmp/lock_lcpasswd'); @@ -318,7 +318,7 @@ system('/bin/chmod','0660', "/home/$safe # # In order to allow the loncapa daemons appropriate access # to public_html, Top level and public_html directories should -# be owned by safeusername:www as should the smaple index.html.. +# be owned by safeusername:safeusername as should the smaple index.html.. print "lcuseradd ownership\n" unless $noprint; system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername"); # First set std ownership on everything. # system('/bin/chown',"$safeusername:www","/home/$safeusername"); # Now adust top level... @@ -329,7 +329,7 @@ if (-e '/var/run/httpd.pid') { open(PID,'/var/run/httpd.pid'); my $pid=; close(PID); - my ($safepid)=($pid=~s/(\D+)//g); + my ($safepid)= $pid=~ /(\D+)/; if ($pid) { system('kill','-USR1',"$safepid"); }