[BACK]Return to lchtmldir CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/Attic/lchtmldir between versions 1.5 and 1.9

version 1.5, 2004/05/13 20:44:38 version 1.9, 2004/10/18 10:56:50
Line 167  if(($dirtry1 ne $dir) or ($dirtry2 ne $d Line 167  if(($dirtry1 ne $dir) or ($dirtry2 ne $d
   
 # As root, create the directory.  # As root, create the directory.
   
 my $fulldir = $dirtry1."/public_html";  my $homedir = $dirtry1;
   my $fulldir = $homedir."/public_html";
   
 if($DEBUG) {  if($DEBUG) {
     print("Full directory path is: $fulldir \n");      print("Full directory path is: $fulldir \n");
 }  }
Line 207  it available to students and other instr Line 209  it available to students and other instr
 END  END
     close OUT;      close OUT;
     }      }
   
 &System("/bin/chmod  02775  $fulldir");  &System("/bin/chmod  02775  $fulldir");
 &System("/bin/chmod  0775  $fulldir"."/index.html");  &System("/bin/chmod  0775  $fulldir"."/index.html");
   
Line 214  END Line 217  END
 # Based on the authentiation mode, set the ownership of the directory.  # Based on the authentiation mode, set the ownership of the directory.
   
 if($authentication eq "unix:") { # Unix mode authentication...  if($authentication eq "unix:") { # Unix mode authentication...
     &System("/bin/chown -R   $username".":".$username." ".$fulldir);      &System("/bin/chown -R   $safeuser".":".$safeuser." ".$fulldir);
     &JoinGroup($username);      &JoinGroup($safeuser);
 } else {  } else {
     # Internal, Kerberos, and Local authentication are for users      # Internal, Kerberos, and Local authentication are for users
     # who do not have unix accounts on the system.  Therefore we      # who do not have unix accounts on the system.  Therefore we
     # will give ownership of their public_html directories to www:www      # will give ownership of their public_html directories to www:www
       # If the user is an internal auth user, the rest of the directory tree
       # gets owned by root.  This chown is needed in case what's really happening
       # is that a file system user is being demoted to internal user...
   
       if($authentication eq "internal:") {
    &System("/bin/chown -R root:root ".$homedir);
       }
     &System("/bin/chown -R www:www  ".$fulldir);      &System("/bin/chown -R www:www  ".$fulldir);
 }  }
 &DisableRoot;  &DisableRoot;
Line 238  exit 0; Line 248  exit 0;
   
 sub EnableRoot {  sub EnableRoot {
     if ($wwwid==$>) {      if ($wwwid==$>) {
         print ("EnableRoot $< $>\n");  
  ($<,$>)=($>,$<);   ($<,$>)=($>,$<);
  ($(,$))=($),$();   ($(,$))=($),$();
     }      }
Line 268  sub JoinGroup { Line 277  sub JoinGroup {
     my $usergroup = shift;      my $usergroup = shift;
   
     my $groups = `/usr/bin/groups www`;      my $groups = `/usr/bin/groups www`;
       # untaint
       my ($safegroups)=($groups=~/:\s+([\s\w]+)/);
       $groups=$safegroups;
     chomp $groups; $groups=~s/^\S+\s+\:\s+//;      chomp $groups; $groups=~s/^\S+\s+\:\s+//;
     my @grouplist=split(/\s+/,$groups);      my @grouplist=split(/\s+/,$groups);
     my @ugrouplist=grep {!/www|$usergroup/} @grouplist;      my @ugrouplist=grep {!/www|$usergroup/} @grouplist;
Line 285  sub JoinGroup { Line 297  sub JoinGroup {
   
   
 sub System {  sub System {
     my $command = shift;      my ($command,@args) = @_;
     if($DEBUG) {      if($DEBUG) {
  print("system: $command \n");   print("system: $command with args ".join(' ',@args)."\n");
     }      }
     system($command);      system($command,@args);
 }  }
   
   
Removed from v.1.5  
changed lines
  Added in v.1.9

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>