[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonlogin.pm

[raeburn]

raeburn		Sat Jun  6 14:40:28 2015 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/auth	lonlogin.pm 
  Log:
  - For 2.11
    Backport 1.163, 1.164
  
  
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.158.2.3 loncom/auth/lonlogin.pm:1.158.2.4
--- loncom/auth/lonlogin.pm:1.158.2.3	Fri Mar  6 22:45:30 2015
+++ loncom/auth/lonlogin.pm	Sat Jun  6 14:40:28 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.158.2.3 2015/03/06 22:45:30 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158.2.4 2015/06/06 14:40:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,9 +388,20 @@
 	       alink        => "$alink",
                onload       => 'javascript:enableInput();',);
 
-    my %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
-    my $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost};
-    my $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost};
+    my ($lonhost_in_use,$headextra,$headextra_exempt, at hosts,%defaultdomconf);
+    @hosts = &Apache::lonnet::current_machine_ids();
+    $lonhost_in_use = $lonhost;
+    if (@hosts > 1) {
+        foreach my $hostid (@hosts) {
+            if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
+                $lonhost_in_use = $hostid;
+                last;
+            }
+        }
+    }
+    %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+    $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
+    $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
     if ($headextra) {
         my $omitextra;
         if ($headextra_exempt ne '') {
@@ -402,7 +413,7 @@
         }
         unless ($omitextra) {
             my $confname = $defdom.'-domainconfig';
-            if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost/\E}) {
+            if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) {
                 my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra));
                 unless ($extra eq '-1') {
                     $js .= "\n".$extra."\n";