--- loncom/lond	2005/01/03 16:08:07	1.273
+++ loncom/lond	2005/02/17 08:57:51	1.279
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.273 2005/01/03 16:08:07 albertel Exp $
+# $Id: lond,v 1.279 2005/02/17 08:57:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,14 +58,13 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.273 $'; #' stupid emacs
+my $VERSION='$Revision: 1.279 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
 
 my $client;
 my $clientip;			# IP address of client.
-my $clientdns;			# DNS name of client.
 my $clientname;			# LonCAPA name of client.
 
 my $server;
@@ -178,7 +177,6 @@ sub ResetStatistics {
 #   $initcmd     - The full text of the init command.
 #
 # Implicit inputs:
-#    $clientdns  - The DNS name of the remote client.
 #    $thisserver - Our DNS name.
 #
 # Returns:
@@ -187,10 +185,10 @@ sub ResetStatistics {
 #
 sub LocalConnection {
     my ($Socket, $initcmd) = @_;
-    Debug("Attempting local connection: $initcmd client: $clientdns me: $thisserver");
-    if($clientdns ne $thisserver) {
+    Debug("Attempting local connection: $initcmd client: $clientip me: $thisserver");
+    if($clientip ne "127.0.0.1") {
 	&logthis('<font color="red"> LocalConnection rejecting non local: '
-		 ."$clientdns ne $thisserver </font>");
+		 ."$clientip ne $thisserver </font>");
 	close $Socket;
 	return undef;
     }  else {
@@ -1799,10 +1797,11 @@ sub change_authentication_handler {
 	    #  to take ownership of the construction space back to www:www
 	    #
 
-	    if( ($oldauth =~ /^unix/) && ($umode eq "internal")) { # unix -> internal
+	    if( (($oldauth =~ /^unix/) && ($umode eq "internal")) ||
+		(($oldauth =~ /^internal/) && ($umode eq "unix")) ) { 
 		if(&is_author($udom, $uname)) {
 		    &Debug(" Need to manage author permissions...");
-		    &manage_permissions("/$udom/_au", $udom, $uname, "internal:");
+		    &manage_permissions("/$udom/_au", $udom, $uname, "$umode:");
 		}
 	    }
 	       
@@ -3198,8 +3197,9 @@ sub put_course_id_handler {
 #                 owner    - optional supplied username of owner to filter
 #                            the dump.  Only courses for which the course 
 #                            owner matches the supplied username will be
-#                            returned. Implicit assumption that owner is a user
-#                            in the domain in which the course database is defined.        
+#                            returned. Implicit assumption that owner
+#                            is a user in the domain in which the
+#                            course database is defined.
 #     $client  - The socket open on the client.
 # Returns:
 #    1     - Continue processing.
@@ -3233,15 +3233,9 @@ sub dump_course_id_handler {
     if ($hashref) {
 	while (my ($key,$value) = each(%$hashref)) {
 	    my ($descr,$lasttime,$inst_code,$owner);
-            my @courseitems = split/:/,$value;
-            $descr = shift @courseitems;
-            $lasttime = pop @courseitems;
-            if (@courseitems > 0) {
-                $inst_code = shift @courseitems;
-            }
-            if (@courseitems > 0) {
-                $owner = shift @courseitems;
-            }
+            my @courseitems = split(/:/,$value);
+            $lasttime = pop(@courseitems);
+	    ($descr,$inst_code,$owner)=@courseitems;
 	    if ($lasttime<$since) { next; }
             my $match = 1;
 	    unless ($description eq '.') {
@@ -4285,12 +4279,18 @@ sub ReadHostTable {
     my $myloncapaname = $perlvar{'lonHostID'};
     Debug("My loncapa name is : $myloncapaname");
     while (my $configline=<CONFIG>) {
-	if (!($configline =~ /^\s*\#/)) {
-	    my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
-	    chomp($ip); $ip=~s/\D+$//;
+	if ($configline !~ /^\s*\#/ && $configline !~ /^\s*$/ ) {
+	    my ($id,$domain,$role,$name)=split(/:/,$configline);
+	    $name=~s/\s//g;
+	    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);
 	    $hostid{$ip}=$id;         # LonCAPA name of host by IP.
 	    $hostdom{$id}=$domain;    # LonCAPA domain name of host. 
-	    $hostip{$id}=$ip;	      # IP address of host.
+	    $hostip{$id}=$ip;         # IP address of host.
 	    $hostdns{$name} = $id;    # LonCAPA name of host by DNS.
 
 	    if ($id eq $perlvar{'lonHostID'}) { 
@@ -4471,7 +4471,7 @@ sub logstatus {
 	flock(LOG,LOCK_EX);
 	print LOG $$."\t".$clientname."\t".$currenthostid."\t"
 	    .$status."\t".$lastlog."\t $keymode\n";
-	flock(DB,LOCK_UN);
+	flock(LOG,LOCK_UN);
 	close(LOG);
     }
     &status("Finished logging");
@@ -4702,8 +4702,6 @@ sub make_new_child {
     if (defined($iaddr)) {
 	$clientip  = inet_ntoa($iaddr);
 	Debug("Connected with $clientip");
-	$clientdns = gethostbyaddr($iaddr, AF_INET);
-	Debug("Connected with $clientdns by name");
     } else {
 	&logthis("Unable to determine clientip");
 	$clientip='Unavailable';
@@ -4743,18 +4741,23 @@ sub make_new_child {
 
 	ReadManagerTable;	# May also be a manager!!
 	
-	my $clientrec=($hostid{$clientip}     ne undef);
-	my $ismanager=($managers{$clientip}    ne undef);
+	my $outsideip=$clientip;
+	if ($clientip eq '127.0.0.1') {
+	    $outsideip=$hostip{$perlvar{'lonHostID'}};
+	}
+
+	my $clientrec=($hostid{$outsideip}     ne undef);
+	my $ismanager=($managers{$outsideip}    ne undef);
 	$clientname  = "[unknonwn]";
 	if($clientrec) {	# Establish client type.
 	    $ConnectionType = "client";
-	    $clientname = $hostid{$clientip};
+	    $clientname = $hostid{$outsideip};
 	    if($ismanager) {
 		$ConnectionType = "both";
 	    }
 	} else {
 	    $ConnectionType = "manager";
-	    $clientname = $managers{$clientip};
+	    $clientname = $managers{$outsideip};
 	}
 	my $clientok;