--- loncom/auth/switchserver.pm	2010/07/17 20:02:02	1.26
+++ loncom/auth/switchserver.pm	2010/07/20 02:42:33	1.27
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.26 2010/07/17 20:02:02 raeburn Exp $
+# $Id: switchserver.pm,v 1.27 2010/07/20 02:42:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -96,15 +96,21 @@ sub handler {
     }
 
     my $canhost = 1;
-    my @machinedoms = &Apache::lonnet::machine_domains($switch_to);
-    unless (grep(/^\Q$env{'user.domain'}\E/,@machinedoms)) {
-        my $machinedom = &Apache::lonnet::host_domain($env{'form.otherserver'});
-        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($machinedom);
+    my $uprimary_id = &Apache::lonnet::domain($env{'user.domain'},'primary');
+    my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
+    my @intdoms = &Apache::lonnet::get_internet_names($env{'form.otherserver'});
+    unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
+        my $serverhomeID = &Apache::lonnet::get_server_homeID($switch_to);
+        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
+        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
         my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
         my $remoterev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'},$env{'form.otherserver'});
-        $canhost = &Apache::lonnet::can_host_session($env{'user.domain'},$machinedom,
-                                                     $remoterev,$udomdefaults{'remotesessions'},
-                                                     $defdomdefaults{'hostedsessions'});
+        $canhost = 
+            &Apache::lonnet::can_host_session($env{'user.domain'},
+                                              $env{'form.otherserver'},
+                                              $remoterev,
+                                              $udomdefaults{'remotesessions'},
+                                              $defdomdefaults{'hostedsessions'});
     }
 
     unless ($canhost) { return FORBIDDEN; }