--- loncom/auth/migrateuser.pm	2014/10/05 13:49:11	1.22
+++ loncom/auth/migrateuser.pm	2014/10/06 00:48:44	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Starts a user off based of an existing token.
 #
-# $Id: migrateuser.pm,v 1.22 2014/10/05 13:49:11 raeburn Exp $
+# $Id: migrateuser.pm,v 1.23 2014/10/06 00:48:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,36 +114,58 @@ sub ip_changed {
         my $url;
         my $lonhost= $r->dir_config('lonHostID');
         my $switchto = $lonhost;
-        if ($rule_in_effect eq 'balancer') {
+        if ($rule_in_effect ne 'offloadedto') {
             my $hosthere;
-            if ($dataref->{'role'}) {
-                my ($adom,$aname);
-                if ($dataref->{'role'} =~ m{^au\./($match_domain)/$}) {
-                    $adom = $1;
-                    $aname = $dataref->{'username'};
-                } elsif ($dataref->{'role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
-                    $adom = $1;
-                    $aname = $2;
-                }
-                if ($adom ne '' && $aname ne '') {
-                    my $ahome = &Apache::lonnet::homeserver($aname,$adom);
-                    unless ($ahome eq 'no_host') {
-                        my @ids=&Apache::lonnet::current_machine_ids();
-                        if ($ahome && grep(/^\Q$ahome\E$/,@ids)) {
-                            $hosthere = 1;
+            my @ids=&Apache::lonnet::current_machine_ids();
+            unless ($rule_in_effect eq 'balancer') {
+                if (grep(/^\Q$rule_in_effect\E$/,@ids)) {
+                    $hosthere = 1;
+                }
+            }
+            unless ($hosthere) {
+                if ($dataref->{'role'}) {
+                    my ($adom,$aname);
+                    if ($dataref->{'role'} =~ m{^au\./($match_domain)/$}) {
+                        $adom = $1;
+                        $aname = $dataref->{'username'};
+                    } elsif ($dataref->{'role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
+                        $adom = $1;
+                        $aname = $2;
+                    }
+                    if ($adom ne '' && $aname ne '') {
+                        my $ahome = &Apache::lonnet::homeserver($aname,$adom);
+                        unless ($ahome eq 'no_host') {
+                            if ($ahome && grep(/^\Q$ahome\E$/,@ids)) {
+                                $hosthere = 1;
+                            }
                         }
                     }
                 }
             }
-            unless ($hosthere) { 
-                my $hostname = &Apache::lonnet::hostname($dataref->{'server'});
+            unless ($hosthere) {
+                my $hostname;
+                if ($rule_in_effect eq 'balancer') {
+                    $hostname = &Apache::lonnet::hostname($dataref->{'server'});
+                    if ($hostname) {
+                        $switchto = $dataref->{'server'};
+                    }
+                } else {
+                    $hostname = &Apache::lonnet::hostname($rule_in_effect);
+                    if ($hostname) {
+                        $switchto = $rule_in_effect;
+                    }
+                }
                 if ($hostname) {
-                    $switchto = $dataref->{'server'};
                     my $protocol = $Apache::lonnet::protocol{$switchto};
                     $protocol = 'http' if ($protocol ne 'https');
                     $url = $protocol.'://'.$hostname;
-                    $message .= '<br />'.
-                                &mt('As a result, your LON-CAPA session is being redirected to the server where you originally logged in.');
+                    if ($rule_in_effect eq 'balancer') {
+                        $message .= '<br />'.
+                                    &mt('As a result, your LON-CAPA session is being redirected to the server where you originally logged in.');
+                    } else {
+                        $message .= '<br />'.
+                                    &mt('As a result, your LON-CAPA session is being redirected.');
+                    }
                 }
             }
         }