--- loncom/lonnet/perl/lonnet.pm	2021/02/01 00:20:56	1.1440
+++ loncom/lonnet/perl/lonnet.pm	2021/02/08 14:50:53	1.1442
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1440 2021/02/01 00:20:56 raeburn Exp $
+# $Id: lonnet.pm,v 1.1442 2021/02/08 14:50:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2164,10 +2164,19 @@ sub get_dom {
     }
     if ($udom && $uhome && ($uhome ne 'no_host')) {
         my $rep;
-        if ($namespace =~ /^enc/) {
-            $rep=&reply("encrypt:egetdom:$udom:$namespace:$items",$uhome);
+        if (grep { $_ eq $uhome } &current_machine_ids()) {
+            # domain information is hosted on this machine
+            my $cmd = 'getdom';
+            if ($namespace =~ /^enc/) {
+                $cmd = 'egetdom';
+            }
+            $rep = &LONCAPA::Lond::get_dom("$cmd:$udom:$namespace:$items");
         } else {
-            $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
+            if ($namespace =~ /^enc/) {
+                $rep=&reply("encrypt:egetdom:$udom:$namespace:$items",$uhome);
+            } else {
+                $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
+            }
         }
         my %returnhash;
         if ($rep eq '' || $rep =~ /^error: 2 /) {
@@ -12419,7 +12428,7 @@ sub EXT {
         }
     } elsif ($realm eq 'client') {
         if ($space eq 'remote_addr') {
-            return $ENV{'REMOTE_ADDR'};
+            return &get_requestor_ip();
         }
     }
     return '';