--- loncom/cgi/lonauthcgi.pm	2015/05/04 15:43:57	1.14
+++ loncom/cgi/lonauthcgi.pm	2021/01/04 03:57:04	1.14.2.2
@@ -1,7 +1,7 @@
 #
 # LON-CAPA authorization for cgi-bin scripts
 #
-# $Id: lonauthcgi.pm,v 1.14 2015/05/04 15:43:57 raeburn Exp $
+# $Id: lonauthcgi.pm,v 1.14.2.2 2021/01/04 03:57:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,7 +92,7 @@ sub check_ipbased_access {
     my ($page,$ip) = @_;
     my $allowed;
     if (!defined($ip)) {
-        $ip = $ENV{'REMOTE_ADDR'};
+        $ip = &Apache::lonnet::get_requestor_ip();
     }
     if ($ip eq '127.0.0.1') {
         $allowed = 1;
@@ -197,10 +197,10 @@ sub check_domain_ip {
     my %remote_doms;
     my $allowed;
     if ($remote_ip ne '') {
-        if (&Apache::lonnet::hostname($remote_ip) ne '') {
+        my @remote_hosts = &Apache::lonnet::get_hosts_from_ip($remote_ip);
+        if (@remote_hosts) {
             my @poss_domains = &Apache::lonnet::current_machine_domains();
             if (@poss_domains > 0) {
-                my @remote_hosts = &Apache::lonnet::get_hosts_from_ip($remote_ip);
                 foreach my $hostid (@remote_hosts) {
                     my $hostdom = &Apache::lonnet::host_domain($hostid);
                     if ($hostdom ne '') {