--- loncom/lonnet/perl/lonnet.pm	2005/02/05 06:44:57	1.593
+++ loncom/lonnet/perl/lonnet.pm	2005/02/09 22:39:49	1.597
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.593 2005/02/05 06:44:57 albertel Exp $
+# $Id: lonnet.pm,v 1.597 2005/02/09 22:39:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,7 +35,7 @@ use HTTP::Headers;
 use HTTP::Date;
 # use Date::Parse;
 use vars 
-qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom 
+qw(%perlvar %hostname %homecache %badServerCache %iphost %spareid %hostdom 
    %libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache
    %courselogs %accesshash %userrolehash $processmarker $dumpcount 
    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %courseresdatacache 
@@ -1817,7 +1817,7 @@ sub checkin {
     my $now=time;
     my ($ta,$tb,$lonhost)=split(/\*/,$token);
     $lonhost=~tr/A-Z/a-z/;
-    my $dtoken=$ta.'_'.$hostip{$lonhost}.'_'.$tb;
+    my $dtoken=$ta.'_'.$hostname{$lonhost}.'_'.$tb;
     $dtoken=~s/\W/\_/g;
     my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
                  split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
@@ -4379,7 +4379,7 @@ sub EXT {
 		}
 	    }
 
-# -------------------------------------------------------- second, check course
+# ------------------------------------------------ second, check some of course
 
 	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
 					   $ENV{'course.'.$courseid.'.domain'},
@@ -4398,7 +4398,7 @@ sub EXT {
 	    }
 	    if ($thisparm) { return $thisparm; }
 	}
-# --------------------------------------------- last, look in resource metadata
+# ------------------------------------------ fourth, look in resource metadata
 
 	$spacequalifierrest=~s/\./\_/;
 	my $filename;
@@ -4413,6 +4413,7 @@ sub EXT {
 	$metadata=&metadata($filename,'parameter_'.$spacequalifierrest);
 	if (defined($metadata)) { return $metadata; }
 
+# ---------------------------------------------- fourth, look in rest pf course
 	if ($symbparm && defined($courseid) && 
 	    $courseid eq $ENV{'request.course.id'}) {
 	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
@@ -5681,12 +5682,18 @@ BEGIN {
     while (my $configline=<$config>) {
        next if ($configline =~ /^(\#|\s*$)/);
        chomp($configline);
-       my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
-       if ($id && $domain && $role && $name && $ip) {
+       my ($id,$domain,$role,$name)=split(/:/,$configline);
+       $name=~s/\s//g;
+       if ($id && $domain && $role && $name) {
+	 my $ip = gethostbyname($name);
+	 if (length($ip) ne 4) {
+	     &logthis("Skipping host $id name $name no IP $ip found\n");
+	     next;
+	 }
+	 $ip=inet_ntoa($ip);
+	 push(@{$iphost{$ip}},$id);
 	 $hostname{$id}=$name;
 	 $hostdom{$id}=$domain;
-	 $hostip{$id}=$ip;
-	 $iphost{$ip}=$id;
 	 if ($role eq 'library') { $libserv{$id}=$name; }
        }
     }