--- loncom/lonnet/perl/lonnet.pm	2021/02/10 15:38:15	1.1172.2.118.2.17
+++ loncom/lonnet/perl/lonnet.pm	2021/02/10 15:48:14	1.1172.2.118.2.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.118.2.17 2021/02/10 15:38:15 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.118.2.18 2021/02/10 15:48:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1899,10 +1899,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 /) {