--- loncom/auth/lontokacc.pm	2005/02/07 17:04:53	1.13
+++ loncom/auth/lontokacc.pm	2007/03/02 23:17:48	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User File Transfers
 #
-# $Id: lontokacc.pm,v 1.13 2005/02/07 17:04:53 albertel Exp $
+# $Id: lontokacc.pm,v 1.17 2007/03/02 23:17:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,13 +37,14 @@ use IO::Socket;
 sub handler {
     my $r = shift;
     my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP);
-    my $netaddr=inet_aton($reqhost);
-    ($reqhost) = gethostbyaddr($netaddr,AF_INET);
-    if (!$reqhost) {
-	$r->log_reason("Unable to do hostname $reqhost lookup for ".$r->get_remote_host(REMOTE_NOLOOKUP));
+    my %iphost=&Apache::lonnet::get_iphost();
+    my $hostids=$iphost{$reqhost};
+    if (!$hostids && $reqhost ne '127.0.0.1' ) {
+	$r->log_reason("Unable to find a host for ".
+		       $r->get_remote_host(REMOTE_NOLOOKUP));
 	return FORBIDDEN;
     }
-    if ($reqhost eq 'localhost.localdomain') {
+    if ($reqhost eq '127.0.0.1') {
        return OK;
     }
     my $readline;
@@ -57,13 +58,16 @@ sub handler {
        while ($readline=<$fh>) {
 	   $readline=~s/\s*$//;
 	   my ($id,$domain,$role,$name)=split(/:/,$readline);
-	   if ($name =~ /\Q$reqhost\E/i) {
-	       return OK; 
+	   foreach my $hostid (@{$hostids}) {
+	       my $hostname=&Apache::lonnet::hostname($hostid);
+	       if ($name =~ /^\Q$hostname\E$/i) {
+		   return OK; 
+	       }
 	   }
        }
 
     }
-    $r->log_reason("Invalid request for user file transfer from $reqhost", 
+    $r->log_reason("Invalid request for user file transfer from $reqhost (".join(",",@{$hostids}).")", 
                    $r->filename); 
     return FORBIDDEN;
 }
@@ -76,6 +80,7 @@ sub removefile {
     } else {
         &Apache::lonnet::logthis('Failed to transfer '.$r->filename);
     }
+    return OK;
 }
 1;
 __END__