--- loncom/Attic/lchtmldir 2005/01/26 10:38:13 1.14 +++ loncom/Attic/lchtmldir 2005/04/07 22:27:52 1.16 @@ -144,7 +144,7 @@ my $safeuser = $patt; if($DEBUG) { print("Save username = $safeuser \n"); } -if(($username ne $safeuser) or ($safeuser!~/^[A-za-z]/)) { +if(($username ne $safeuser) or ($safeuser!~/^[A-z]/)) { if($DEBUG) { print("User name $username had illegal characters\n"); } @@ -185,6 +185,17 @@ if(!( -e $dirtry1)) { exit 6; } } +if ($authentication eq "unix:") { + # check whether group $safeuser exists. + my $usergroups = `id -nG $safeuser`; + if (! grep /^$safeuser$/, split(/\s+/,$usergroups)) { + if($DEBUG) { + print("Group \"$safeuser\" does not exist or $safeuser is not a member of that group.\n"); + } + exit 7; + } +} + &EnableRoot; &System("/bin/mkdir -p $fulldir") unless (-e $fulldir); @@ -221,6 +232,7 @@ END # Based on the authentiation mode, set the ownership of the directory. if($authentication eq "unix:") { # Unix mode authentication... + print "Unix auth\n"; &System("/bin/chown -R $safeuser:$safeuser"." ".$fulldir); &JoinGroup($safeuser); } else { @@ -300,7 +312,10 @@ sub DisableRoot { print("Disable root: id = ".$>."\n"); } } - +# +# Join the www user to the user's group. +# we must be running with euid as root at this time. +# sub JoinGroup { my $usergroup = shift; @@ -319,7 +334,16 @@ sub JoinGroup { } exit 6; } - + if (-e '/var/run/httpd.pid') { + open(PID,'/var/run/httpd.pid'); + my $pid=; + close(PID); + my ($safepid) = $pid=~ /(\d+)/; + $pid = $safepid; + if ($pid) { + my $status = system("kill -USR1 $safepid"); + } + } }