--- loncom/auth/lonracc.pm	2002/07/26 19:35:20	1.5
+++ loncom/auth/lonracc.pm	2003/05/23 07:13:27	1.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for File Transfers
 #
-# $Id: lonracc.pm,v 1.5 2002/07/26 19:35:20 albertel Exp $
+# $Id: lonracc.pm,v 1.8 2003/05/23 07:13:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,9 +52,12 @@ sub subscribed {
 
 sub handler {
     my $r = shift;
-    my $reqhost;
-    unless ($reqhost=$r->get_remote_host(REMOTE_DOUBLE_REV)) {
-       $r->log_reason("Spoof request");
+    my $reqhost = $r->get_remote_host(REMOTE_DOUBLE_REV);
+    if (!$reqhost && $r->get_remote_host(REMOTE_NOLOOKUP) eq $r->get_server_name()) { 
+        $reqhost = $r->get_server_name();
+    } 
+    unless ($reqhost) {
+       $r->log_reason("Spoof request from ".$ENV{'REMOTE_ADDR'});
        return FORBIDDEN;
     }
     my $readline;
@@ -66,6 +69,7 @@ sub handler {
           return FORBIDDEN;
        }
        while ($readline=<$fh>) {
+	  my $return;
           my ($id,$domain,$role,$name,$ip)=split(/:/,$readline);
           if ($name =~ /$reqhost/i) {
               my $filename=$r->filename;
@@ -74,12 +78,13 @@ sub handler {
 		  ($filename=~/\.meta$/)) {
 	         return OK;
               } else {
-                 $r->log_reason("$id not subscribed", $r->filename);
-                 return FORBIDDEN;
+                 $return=FORBIDDEN;
               }
           }
        }
-
+       if ($return == FORBIDDEN) {
+	   $r->log_reason("$id not subscribed", $r->filename);
+       }
     }
     $r->log_reason("Invalid request for file transfer from $reqhost", 
                    $r->filename);