--- loncom/auth/lonlogin.pm	2007/01/13 20:39:57	1.86
+++ loncom/auth/lonlogin.pm	2007/01/14 02:00:04	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.86 2007/01/13 20:39:57 raeburn Exp $
+# $Id: lonlogin.pm,v 1.87 2007/01/14 02:00:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,17 +40,6 @@ use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
-
-sub additional_machine_domains {
-    my @domains;
-    open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab');
-    while( my $line = <$fh>) {
-	$line =~ s/\s//g;
-	push(@domains,$line);
-    }
-    return @domains;
-}
-
 sub handler {
     my $r = shift;
 
@@ -137,12 +126,7 @@ ENDFAILED
     }
     my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
                   $r->dir_config('lonIconsURL');
-    my $domain  = $r->dir_config('lonDefDomain');
-    my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
-    foreach my $posdom (&Apache::lonnet::current_machine_domains(),
-			&additional_machine_domains()) {
-	if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
-    }
+    my $domain = &Apache::lonnet::default_login_domain();
     if (($env{'form.domain'}) && 
 	 ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
 	$domain=$env{'form.domain'};