--- loncom/lonnet/perl/lonnet.pm	2002/05/18 18:54:29	1.226
+++ loncom/lonnet/perl/lonnet.pm	2002/05/21 13:06:07	1.229
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.226 2002/05/18 18:54:29 www Exp $
+# $Id: lonnet.pm,v 1.229 2002/05/21 13:06:07 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -481,21 +481,22 @@ sub authenticate {
 # ---------------------- Find the homebase for a user from domain's lib servers
 
 sub homeserver {
-    my ($uname,$udom)=@_;
+    my ($uname,$udom, $cacheBadFlag)=@_;
     my $index="$uname:$udom";
     if ($homecache{$index}) { 
         return "$homecache{$index}"; 
     }
     my $tryserver;
     foreach $tryserver (keys %libserv) {
-        next if (exists($badhomecache{$index}->{$tryserver}));
+        next if ($cacheBadFlag eq 'true' && 
+		 exists($badhomecache{$index}->{$tryserver}));
 	if ($hostdom{$tryserver} eq $udom) {
            my $answer=reply("home:$udom:$uname",$tryserver);
            if ($answer eq 'found') { 
               $homecache{$index}=$tryserver;
               return $tryserver; 
            } else {
-               $badhomecache{$index}->{$tryserver}=1;
+	       $badhomecache{$index}->{$tryserver}=1;
            }
        } else {
            $badhomecache{$index}->{$tryserver}=1;
@@ -2805,12 +2806,10 @@ sub goodbye {
 }
 
 BEGIN {
-# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
-# (eventually access.conf will become deprecated)
+# ----------------------------------- Read loncapa.conf and loncapa_apache.conf
     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>) {
         if ($configline =~ /^[^\#]*PerlSetVar/) {
@@ -2821,7 +2820,7 @@ 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>) {
         if ($configline =~ /^[^\#]*PerlSetVar/) {