--- loncom/lond	2003/11/12 20:47:04	1.162
+++ loncom/lond	2004/01/14 01:20:40	1.165.2.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.162 2003/11/12 20:47:04 matthew Exp $
+# $Id: lond,v 1.165.2.1 2004/01/14 01:20:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,7 +52,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.162 $'; #' stupid emacs
+my $VERSION='$Revision: 1.165.2.1 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -205,26 +205,7 @@ sub ReadManagerTable {
 sub ValidManager {
     my $certificate = shift; 
 
-    ReadManagerTable;
-
-    my $hostname   = $hostid{$certificate};
-
-
-    if ($hostname ne undef) {
-	if($managers{$hostname} ne undef) {
-	    &logthis('<font color="yellow">Authenticating manager'.
-		     " $hostname</font>");
-	    return 1;
-	} else {
-	    &logthis('<font color="red" failed manager authentication '.
-		     $hostname." is not a valid manager host</font>");
-	    return 0;
-	}
-    } else {
-	&logthis('<font color="red"> Failed manager authentication '.
-		 "$certificate </font>");
-	return 0;
-    }
+    return isManager;
 }
 #
 #  CopyFile:  Called as part of the process of installing a 
@@ -532,6 +513,7 @@ sub catchexception {
     my ($error)=@_;
     $SIG{'QUIT'}='DEFAULT';
     $SIG{__DIE__}='DEFAULT';
+    &status("Catching exception");
     &logthis("<font color=red>CRITICAL: "
      ."ABNORMAL EXIT. Child $$ for server $thisserver died through "
      ."a crash with this error msg->[$error]</font>");
@@ -542,6 +524,7 @@ sub catchexception {
 }
 
 sub timeout {
+    &status("Handling Timeout");
     &logthis("<font color=ref>CRITICAL: TIME OUT ".$$."</font>");
     &catchexception('Timeout');
 }
@@ -598,6 +581,7 @@ my $children               = 0;        #
 
 sub REAPER {                        # takes care of dead children
     $SIG{CHLD} = \&REAPER;
+    &status("Handling child death");
     my $pid = wait;
     if (defined($children{$pid})) {
 	&logthis("Child $pid died");
@@ -606,25 +590,30 @@ sub REAPER {                        # ta
     } else {
 	&logthis("Unknown Child $pid died");
     }
+    &status("Finished Handling child death");
 }
 
 sub HUNTSMAN {                      # signal handler for SIGINT
+    &status("Killing children (INT)");
     local($SIG{CHLD}) = 'IGNORE';   # we're going to kill our children
     kill 'INT' => keys %children;
     &logthis("Free socket: ".shutdown($server,2)); # free up socket
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lond.pid");
     &logthis("<font color=red>CRITICAL: Shutting down</font>");
+    &status("Done killing children");
     exit;                           # clean up with dignity
 }
 
 sub HUPSMAN {                      # signal handler for SIGHUP
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
+    &status("Killing children for restart (HUP)");
     kill 'INT' => keys %children;
     &logthis("Free socket: ".shutdown($server,2)); # free up socket
     &logthis("<font color=red>CRITICAL: Restarting</font>");
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lond.pid");
+    &status("Restarting self (HUP)");
     exec("$execdir/lond");         # here we go again
 }
 
@@ -686,6 +675,7 @@ sub ReloadApache {
 #     now be honored.
 #
 sub UpdateHosts {
+    &status("Reload hosts.tab");
     logthis('<font color="blue"> Updating connections </font>');
     #
     #  The %children hash has the set of IP's we currently have children
@@ -710,10 +700,12 @@ sub UpdateHosts {
 	}
     }
     ReloadApache;
+    &status("Finished reloading hosts.tab");
 }
 
 
 sub checkchildren {
+    &status("Checking on the children (sending signals)");
     &initnewstatus();
     &logstatus();
     &logthis('Going to check on the children');
@@ -728,6 +720,7 @@ sub checkchildren {
     sleep 5;
     $SIG{ALRM} = sub { die "timeout" };
     $SIG{__DIE__} = 'DEFAULT';
+    &status("Checking on the children (waiting for reports)");
     foreach (sort keys %children) {
         unless (-e "$docdir/lon-status/londchld/$_.txt") {
           eval {
@@ -745,6 +738,7 @@ sub checkchildren {
     }
     $SIG{ALRM} = 'DEFAULT';
     $SIG{__DIE__} = \&catchexception;
+    &status("Finished checking children");
 }
 
 # --------------------------------------------------------------------- Logging
@@ -787,17 +781,20 @@ sub Reply {
 # ------------------------------------------------------------------ Log status
 
 sub logstatus {
+    &status("Doing logging");
     my $docdir=$perlvar{'lonDocRoot'};
     {
     my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
     print $fh $$."\t".$currenthostid."\t".$status."\t".$lastlog."\n";
     $fh->close();
     }
+    &status("Finished londstatus.txt");
     {
 	my $fh=IO::File->new(">$docdir/lon-status/londchld/$$.txt");
         print $fh $status."\n".$lastlog."\n".time;
         $fh->close();
     }
+    &status("Finished logging");
 }
 
 sub initnewstatus {
@@ -985,8 +982,11 @@ ReadHostTable;
 #   along the connection.
 
 while (1) {
+    &status('Starting accept');
     $client = $server->accept() or next;
+    &status('Accepted '.$client.' off to spawn');
     make_new_child($client);
+    &status('Finished spawning');
 }
 
 sub make_new_child {
@@ -995,6 +995,7 @@ sub make_new_child {
     my $sigset;
 
     $client = shift;
+    &status('Starting new child '.$client);
     &logthis('<font color="green"> Attempting to start child ('.$client.
 	     ")</font>");    
     # block signal for fork
@@ -1438,7 +1439,7 @@ sub make_new_child {
 				    unless (mkdir($fpnow,0777)) {
 					$fperror="error: ".($!+0)
 					    ." mkdir failed while attempting "
-					    ."makeuser\n";
+					    ."makeuser";
 				    }
 				}
 			    }
@@ -1958,7 +1959,7 @@ sub make_new_child {
 			my %hash;
 			if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
 			    foreach my $key (@keys) {
-				delete($hash{$key});
+				delete($hash{&unescape($key)});
 			    }
 			    if (untie(%hash)) {
 				print $client "ok\n";
@@ -2519,6 +2520,7 @@ sub make_new_child {
 		    &logthis(
 			     "Client $clientip ($clientname) hanging up: $userinput");
 		    print $client "bye\n";
+		    $client->shutdown(2);        # shutdown the socket forcibly.
 		    $client->close();
 		    last;