--- loncom/auth/lontokacc.pm	2005/02/10 22:30:56	1.14
+++ loncom/auth/lontokacc.pm	2020/12/18 15:23:03	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Access Handler for User File Transfers
 #
-# $Id: lontokacc.pm,v 1.14 2005/02/10 22:30:56 albertel Exp $
+# $Id: lontokacc.pm,v 1.20 2020/12/18 15:23:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,10 +36,9 @@ use IO::Socket;
 
 sub handler {
     my $r = shift;
-    my $reqhost = $r->get_remote_host(REMOTE_NOLOOKUP);
-    my %iphost=&Apache::lonnet::get_iphost();
-    my $hostids=$iphost{$reqhost};
-    if (!$hostids && $reqhost ne '127.0.0.1' ) {
+    my $reqhost = &Apache::lonnet::get_requestor_ip($r,REMOTE_NOLOOKUP,1);
+    my @hostids= &Apache::lonnet::get_hosts_from_ip($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;
@@ -47,28 +46,7 @@ sub handler {
     if ($reqhost eq '127.0.0.1') {
        return OK;
     }
-    my $readline;
-    my $lontabdir=$r->dir_config('lonTabDir');
-    {
-       my $fh;
-       unless ($fh=Apache::File->new("$lontabdir/hosts.tab")) {
-          $r->log_reason("Could not find host tab file");
-          return FORBIDDEN;
-       }
-       while ($readline=<$fh>) {
-	   $readline=~s/\s*$//;
-	   my ($id,$domain,$role,$name)=split(/:/,$readline);
-	   foreach my $hostid (@{$hostids}) {
-	       if ($name =~ /^\Q$hostid\E$/i) {
-		   return OK; 
-	       }
-	   }
-       }
-
-    }
-    $r->log_reason("Invalid request for user file transfer from $reqhost", 
-                   $r->filename); 
-    return FORBIDDEN;
+    return OK;
 }
 
 sub removefile {
@@ -79,6 +57,7 @@ sub removefile {
     } else {
         &Apache::lonnet::logthis('Failed to transfer '.$r->filename);
     }
+    return OK;
 }
 1;
 __END__