Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.226 and 1.229

version 1.226, 2002/05/18 18:54:29 version 1.229, 2002/05/21 13:06:07
Line 481  sub authenticate { Line 481  sub authenticate {
 # ---------------------- Find the homebase for a user from domain's lib servers  # ---------------------- Find the homebase for a user from domain's lib servers
   
 sub homeserver {  sub homeserver {
     my ($uname,$udom)=@_;      my ($uname,$udom, $cacheBadFlag)=@_;
     my $index="$uname:$udom";      my $index="$uname:$udom";
     if ($homecache{$index}) {       if ($homecache{$index}) { 
         return "$homecache{$index}";           return "$homecache{$index}"; 
     }      }
     my $tryserver;      my $tryserver;
     foreach $tryserver (keys %libserv) {      foreach $tryserver (keys %libserv) {
         next if (exists($badhomecache{$index}->{$tryserver}));          next if ($cacheBadFlag eq 'true' && 
    exists($badhomecache{$index}->{$tryserver}));
  if ($hostdom{$tryserver} eq $udom) {   if ($hostdom{$tryserver} eq $udom) {
            my $answer=reply("home:$udom:$uname",$tryserver);             my $answer=reply("home:$udom:$uname",$tryserver);
            if ($answer eq 'found') {              if ($answer eq 'found') { 
               $homecache{$index}=$tryserver;                $homecache{$index}=$tryserver;
               return $tryserver;                 return $tryserver; 
            } else {             } else {
                $badhomecache{$index}->{$tryserver}=1;         $badhomecache{$index}->{$tryserver}=1;
            }             }
        } else {         } else {
            $badhomecache{$index}->{$tryserver}=1;             $badhomecache{$index}->{$tryserver}=1;
Line 2805  sub goodbye { Line 2806  sub goodbye {
 }  }
   
 BEGIN {  BEGIN {
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf  # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
 # (eventually access.conf will become deprecated)  
     unless ($readit) {      unless ($readit) {
   
 {  {
     my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");      my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf");
   
     while (my $configline=<$config>) {      while (my $configline=<$config>) {
         if ($configline =~ /^[^\#]*PerlSetVar/) {          if ($configline =~ /^[^\#]*PerlSetVar/) {
Line 2821  BEGIN { Line 2820  BEGIN {
     }      }
 }  }
 {  {
     my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf");      my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");
   
     while (my $configline=<$config>) {      while (my $configline=<$config>) {
         if ($configline =~ /^[^\#]*PerlSetVar/) {          if ($configline =~ /^[^\#]*PerlSetVar/) {

Removed from v.1.226  
changed lines
  Added in v.1.229


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