--- loncom/auth/lonauth.pm	2023/07/05 17:33:03	1.121.2.24.2.7
+++ loncom/auth/lonauth.pm	2024/10/09 18:12:23	1.121.2.24.2.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.121.2.24.2.7 2023/07/05 17:33:03 raeburn Exp $
+# $Id: lonauth.pm,v 1.121.2.24.2.8 2024/10/09 18:12:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -220,6 +220,27 @@ sub success {
         }
         $args->{'redirect'} = [0,$destination,'',$write_to_opener];
     } else {
+        if ($env{'environment.remote'} eq 'on') {
+            my $checkexempt;
+            if ($env{'user.loadbalexempt'} eq $r->dir_config('lonHostID')) {
+                if ($env{'user.loadbalcheck.time'} + 600 > time) {
+                    $checkexempt = 1;
+                }
+            }
+            if ($env{'user.noloadbalance'} eq $r->dir_config('lonHostID')) {
+                $checkexempt = 1;
+            }
+            unless (($checkexempt) ||
+                    (($destination =~ m{^/adm/switchserver}) && (!$r->is_initial_req()))) {
+                my ($is_balancer,$otherserver) =
+                    &Apache::lonnet::check_loadbalancing($env{'user.name'},
+                                                         $env{'user.domain'});
+                if (($is_balancer) && ($otherserver ne '') &&
+                    ($otherserver ne $r->dir_config('lonHostID'))) {
+                    $env{'environment.remote'} = 'off';
+                }
+            }
+        }
         $startupremote=&Apache::lonmenu::startupremote($destination);
     }