--- loncom/lond	2000/12/06 18:05:51	1.29
+++ loncom/lond	2003/09/16 10:13:20	1.145
@@ -1,31 +1,407 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
+#
+# $Id: lond,v 1.145 2003/09/16 10:13:20 foxr Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 5/26/99,6/4,6/10,6/11,6/14,6/15,6/26,6/28,6/30,
 # 7/8,7/9,7/10,7/12,7/17,7/19,9/21,
 # 10/7,10/8,10/9,10/11,10/13,10/15,11/4,11/16,
 # 12/7,12/15,01/06,01/11,01/12,01/14,2/8,
 # 03/07,05/31 Gerd Kortemeyer
-# 06/26 Scott Harrison
 # 06/29,06/30,07/14,07/15,07/17,07/20,07/25,09/18 Gerd Kortemeyer
-# 12/05 Scott Harrison
-# 12/05 Gerd Kortemeyer
+# 12/05,12/13,12/29 Gerd Kortemeyer
+# YEAR=2001
+# 02/12 Gerd Kortemeyer
+# 03/24 Gerd Kortemeyer
+# 05/11,05/28,08/30 Gerd Kortemeyer
+# 11/26,11/27 Gerd Kortemeyer
+# 12/22 Gerd Kortemeyer
+# YEAR=2002
+# 01/20/02,02/05 Gerd Kortemeyer
+# 02/05 Guy Albertelli
+# 02/12 Gerd Kortemeyer
+# 02/19 Matthew Hall
+# 02/25 Gerd Kortemeyer
+# 01/xx/2003 Ron Fox.. Remove preforking.  This makes the general daemon
+#      logic simpler (and there were problems maintaining the preforked
+#      population).  Since the time averaged connection rate is close to zero
+#      because lonc's purpose is to maintain near continuous connnections,
+#      preforking is not really needed.
+# 08/xx/2003 Ron Fox:  Add management requests.  Management requests
+#      will be validated via a call to ValidateManager. At present, this
+#      is done by simple host verification.  In the future we can modify
+#      this function to do a certificate check.
+#      Management functions supported include:
+#       - pushing /home/httpd/lonTabs/hosts.tab
+#       - pushing /home/httpd/lonTabs/domain.tab
+# 09/08/2003 Ron Fox:  Told lond to take care of change logging so we
+#      don't have to remember it:
+# $Log: lond,v $
+# Revision 1.145  2003/09/16 10:13:20  foxr
+# Added ReinitProcess function to oversee the parsing and processing of the
+# reinit:<process> client request.
+#
+# Revision 1.144  2003/09/16 09:47:01  foxr
+# Added skeletal support for SIGUSR2 (update hosts.tab)
+#
+# Revision 1.143  2003/09/15 10:03:52  foxr
+# Completed and tested code for pushfile.
+#
+# Revision 1.142  2003/09/09 20:47:46  www
+# Permanently store chatroom entries in chatroom.log
 #
-# based on "Perl Cookbook" ISBN 1-56592-243-3
-# preforker - server who forks first
-# runs as a daemon
-# HUPs
-# uses IDEA encryption
+# Revision 1.141  2003/09/08 10:32:07  foxr
+# Added PushFile sub This sub oversees the push of a new configuration table file
+# Currently supported files are:
+# - hosts.tab   (transaction pushfile:hosts:contents)
+# - domain.tab  (transaction pushfile:domain:contents)
+#
+
+
+use strict;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
 
 use IO::Socket;
 use IO::File;
-use Apache::File;
+#use Apache::File;
 use Symbol;
 use POSIX;
 use Crypt::IDEA;
 use LWP::UserAgent();
 use GDBM_File;
 use Authen::Krb4;
+use Authen::Krb5;
+use lib '/home/httpd/lib/perl/';
+use localauth;
+use File::Copy;
+
+my $DEBUG = 0;		       # Non zero to enable debug log entries.
+
+my $status='';
+my $lastlog='';
+
+my $VERSION='$Revision: 1.145 $'; #' stupid emacs
+my $remoteVERSION;
+my $currenthostid;
+my $currentdomainid;
+
+my $client;
+my $clientip;
+
+my $server;
+my $thisserver;
+
+my %hostid;
+my %hostdom;
+my %hostip;
+my %perlvar;			# Will have the apache conf defined perl vars.
+
+#
+#  The array below are password error strings."
+#
+my $lastpwderror    = 13;		# Largest error number from lcpasswd.
+my @passwderrors = ("ok",
+		   "lcpasswd must be run as user 'www'",
+		   "lcpasswd got incorrect number of arguments",
+		   "lcpasswd did not get the right nubmer of input text lines",
+		   "lcpasswd too many simultaneous pwd changes in progress",
+		   "lcpasswd User does not exist.",
+		   "lcpasswd Incorrect current passwd",
+		   "lcpasswd Unable to su to root.",
+		   "lcpasswd Cannot set new passwd.",
+		   "lcpasswd Username has invalid characters",
+		   "lcpasswd Invalid characters in password",
+		    "11", "12",
+		    "lcpasswd Password mismatch");
+
+
+#  The array below are lcuseradd error strings.:
+
+my $lastadderror = 13;
+my @adderrors    = ("ok",
+		    "User ID mismatch, lcuseradd must run as user www",
+		    "lcuseradd Incorrect number of command line parameters must be 3",
+		    "lcuseradd Incorrect number of stdinput lines, must be 3",
+		    "lcuseradd Too many other simultaneous pwd changes in progress",
+		    "lcuseradd User does not exist",
+		    "lcuseradd Unabel to mak ewww member of users's group",
+		    "lcuseradd Unable to su to root",
+		    "lcuseradd Unable to set password",
+		    "lcuseradd Usrname has invbalid charcters",
+		    "lcuseradd Password has an invalid character",
+		    "lcuseradd User already exists",
+		    "lcuseradd Could not add user.",
+		    "lcuseradd Password mismatch");
+
+
+#
+#   GetCertificate: Given a transaction that requires a certificate,
+#   this function will extract the certificate from the transaction
+#   request.  Note that at this point, the only concept of a certificate
+#   is the hostname to which we are connected.
+#
+#   Parameter:
+#      request   - The request sent by our client (this parameterization may
+#                  need to change when we really use a certificate granting
+#                  authority.
+#
+sub GetCertificate {
+    my $request = shift;
+
+    return $clientip;
+}
+
+
+#
+#  ValidManager: Determines if a given certificate represents a valid manager.
+#                in this primitive implementation, the 'certificate' is
+#                just the connecting loncapa client name.  This is checked
+#                against a valid client list in the configuration.
+#
+#                  
+sub ValidManager {
+    my $certificate = shift; 
+
+    my $hostentry   = $hostid{$certificate};
+    if ($hostentry ne undef) {
+	&logthis('<font color="yellow">Authenticating manager'.
+		 " $hostentry</font>");
+	return 1;
+    } else {
+	&logthis('<font color="red"> Failed manager authentication '.
+		 "$certificate </font>");
+    }
+}
+#
+#  CopyFile:  Called as part of the process of installing a 
+#             new configuration file.  This function copies an existing
+#             file to a backup file.
+# Parameters:
+#     oldfile  - Name of the file to backup.
+#     newfile  - Name of the backup file.
+# Return:
+#     0   - Failure (errno has failure reason).
+#     1   - Success.
+#
+sub CopyFile {
+    my $oldfile = shift;
+    my $newfile = shift;
+
+    #  The file must exist:
+
+    if(-e $oldfile) {
+
+	 # Read the old file.
+
+	my $oldfh = IO::File->new("< $oldfile");
+	if(!$oldfh) {
+	    return 0;
+	}
+	my @contents = <$oldfh>;  # Suck in the entire file.
+
+	# write the backup file:
+
+	my $newfh = IO::File->new("> $newfile");
+	if(!(defined $newfh)){
+	    return 0;
+	}
+	my $lines = scalar @contents;
+	for (my $i =0; $i < $lines; $i++) {
+	    print $newfh ($contents[$i]);
+	}
+
+	$oldfh->close;
+	$newfh->close;
+
+	chmod(0660, $newfile);
+
+	return 1;
+	    
+    } else {
+	return 0;
+    }
+}
+
+#
+#   InstallFile: Called to install an administrative file:
+#       - The file is created with <name>.tmp
+#       - The <name>.tmp file is then mv'd to <name>
+#   This lugubrious procedure is done to ensure that we are never without
+#   a valid, even if dated, version of the file regardless of who crashes
+#   and when the crash occurs.
+#
+#  Parameters:
+#       Name of the file
+#       File Contents.
+#  Return:
+#      nonzero - success.
+#      0       - failure and $! has an errno.
+#
+sub InstallFile {
+    my $Filename = shift;
+    my $Contents = shift;
+    my $TempFile = $Filename.".tmp";
+
+    #  Open the file for write:
+
+    my $fh = IO::File->new("> $TempFile"); # Write to temp.
+    if(!(defined $fh)) {
+	&logthis('<font color="red"> Unable to create '.$TempFile."</font>");
+	return 0;
+    }
+    #  write the contents of the file:
+
+    print $fh ($Contents); 
+    $fh->close;			# In case we ever have a filesystem w. locking
+
+    chmod(0660, $TempFile);
+
+    # Now we can move install the file in position.
+    
+    move($TempFile, $Filename);
+
+    return 1;
+}
+
+#
+#   PushFile:  Called to do an administrative push of a file.
+#              - Ensure the file being pushed is one we support.
+#              - Backup the old file to <filename.saved>
+#              - Separate the contents of the new file out from the
+#                rest of the request.
+#              - Write the new file.
+#  Parameter:
+#     Request - The entire user request.  This consists of a : separated
+#               string pushfile:tablename:contents.
+#     NOTE:  The contents may have :'s in it as well making things a bit
+#            more interesting... but not much.
+#  Returns:
+#     String to send to client ("ok" or "refused" if bad file).
+#
+sub PushFile {
+    my $request = shift;    
+    my ($command, $filename, $contents) = split(":", $request, 3);
+    
+    #  At this point in time, pushes for only the following tables are
+    #  supported:
+    #   hosts.tab  ($filename eq host).
+    #   domain.tab ($filename eq domain).
+    # Construct the destination filename or reject the request.
+    #
+    # lonManage is supposed to ensure this, however this session could be
+    # part of some elaborate spoof that managed somehow to authenticate.
+    #
+
+    my $tablefile = $perlvar{'lonTabDir'}.'/'; # need to precede with dir.
+    if ($filename eq "host") {
+	$tablefile .= "hosts.tab";
+    } elsif ($filename eq "domain") {
+	$tablefile .= "domain.tab";
+    } else {
+	return "refused";
+    }
+    #
+    # >copy< the old table to the backup table
+    #        don't rename in case system crashes/reboots etc. in the time
+    #        window between a rename and write.
+    #
+    my $backupfile = $tablefile;
+    $backupfile    =~ s/\.tab$/.old/;
+    if(!CopyFile($tablefile, $backupfile)) {
+	&logthis('<font color="green"> CopyFile from '.$tablefile." to ".$backupfile." failed </font>");
+	return "error:$!";
+    }
+    &logthis('<font color="green"> Pushfile: backed up '
+	    .$tablefile." to $backupfile</font>");
+    
+    #  Install the new file:
+
+    if(!InstallFile($tablefile, $contents)) {
+	&logthis('<font color="red"> Pushfile: unable to install '
+	 .$tablefile." $! </font>");
+	return "error:$!";
+    }
+    else {
+	&logthis('<font color="green"> Installed new '.$tablefile
+		 ."</font>");
+
+    }
+
+
+    #  Indicate success:
+ 
+    return "ok";
+
+}
+
+#
+#  Called to re-init either lonc or lond.
+#
+#  Parameters:
+#    request   - The full request by the client.  This is of the form
+#                reinit:<process>  
+#                where <process> is allowed to be either of 
+#                lonc or lond
+#
+#  Returns:
+#     The string to be sent back to the client either:
+#   ok         - Everything worked just fine.
+#   error:why  - There was a failure and why describes the reason.
+#
+#
+sub ReinitProcess {
+    my $request = shift;
+
+    return 'ok';
+}
+
+#
+#  Convert an error return code from lcpasswd to a string value.
+#
+sub lcpasswdstrerror {
+    my $ErrorCode = shift;
+    if(($ErrorCode < 0) || ($ErrorCode > $lastpwderror)) {
+	return "lcpasswd Unrecognized error return value ".$ErrorCode;
+    } else {
+	return $passwderrors[$ErrorCode];
+    }
+}
+
+#
+# Convert an error return code from lcuseradd to a string value:
+#
+sub lcuseraddstrerror {
+    my $ErrorCode = shift;
+    if(($ErrorCode < 0) || ($ErrorCode > $lastadderror)) {
+	return "lcuseradd - Unrecognized error code: ".$ErrorCode;
+    } else {
+	return $adderrors[$ErrorCode];
+    }
+}
 
 # grabs exception and records it to log before exiting
 sub catchexception {
@@ -33,29 +409,38 @@ sub catchexception {
     $SIG{'QUIT'}='DEFAULT';
     $SIG{__DIE__}='DEFAULT';
     &logthis("<font color=red>CRITICAL: "
-     ."ABNORMAL EXIT. Child $$ for server $wasserver died through "
+     ."ABNORMAL EXIT. Child $$ for server $thisserver died through "
      ."a crash with this error msg->[$error]</font>");
+    &logthis('Famous last words: '.$status.' - '.$lastlog);
     if ($client) { print $client "error: $error\n"; }
+    $server->close();
     die($error);
 }
 
+sub timeout {
+    &logthis("<font color=ref>CRITICAL: TIME OUT ".$$."</font>");
+    &catchexception('Timeout');
+}
 # -------------------------------- Set signal handlers to record abnormal exits
 
 $SIG{'QUIT'}=\&catchexception;
 $SIG{__DIE__}=\&catchexception;
 
-# ------------------------------------ Read httpd access.conf and get variables
-
-open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
-
-while ($configline=<CONFIG>) {
-    if ($configline =~ /PerlSetVar/) {
-	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-        chomp($varvalue);
-        $perlvar{$varname}=$varvalue;
-    }
+# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
+&status("Read loncapa.conf and loncapa_apache.conf");
+my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
+%perlvar=%{$perlvarref};
+undef $perlvarref;
+
+# ----------------------------- Make sure this process is running from user=www
+my $wwwid=getpwnam('www');
+if ($wwwid!=$<) {
+   my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   my $subj="LON: $currenthostid User ID mismatch";
+   system("echo 'User ID mismatch.  lond must be run as user www.' |\
+ mailto $emailto -s '$subj' > /dev/null");
+   exit 1;
 }
-close(CONFIG);
 
 # --------------------------------------------- Check if other instance running
 
@@ -68,18 +453,17 @@ if (-e $pidfile) {
    if (kill 0 => $pide) { die "already running"; }
 }
 
-$PREFORK=4; # number of children to maintain, at least four spare
-
 # ------------------------------------------------------------- Read hosts file
 
 open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
 
-while ($configline=<CONFIG>) {
+while (my $configline=<CONFIG>) {
     my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
-    chomp($ip);
+    chomp($ip); $ip=~s/\D+$//;
     $hostid{$ip}=$id;
+    $hostdom{$id}=$domain;
+    $hostip{$id}=$ip;
     if ($id eq $perlvar{'lonHostID'}) { $thisserver=$name; }
-    $PREFORK++;
 }
 close(CONFIG);
 
@@ -95,22 +479,25 @@ $server = IO::Socket::INET->new(LocalPor
 
 # global variables
 
-$MAX_CLIENTS_PER_CHILD  = 5;        # number of clients each child should 
-                                    # process
-%children               = ();       # keys are current child process IDs
-$children               = 0;        # current number of children
+my %children               = ();       # keys are current child process IDs
+my $children               = 0;        # current number of children
 
 sub REAPER {                        # takes care of dead children
     $SIG{CHLD} = \&REAPER;
     my $pid = wait;
-    $children --;
-    &logthis("Child $pid died");
-    delete $children{$pid};
+    if (defined($children{$pid})) {
+	&logthis("Child $pid died");
+	$children --;
+	delete $children{$pid};
+    } else {
+	&logthis("Unknown Child $pid died");
+    }
 }
 
 sub HUNTSMAN {                      # signal handler for SIGINT
     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>");
@@ -120,12 +507,60 @@ sub HUNTSMAN {                      # si
 sub HUPSMAN {                      # signal handler for SIGHUP
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
     kill 'INT' => keys %children;
-    close($server);                # free up socket
+    &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");
     exec("$execdir/lond");         # here we go again
 }
 
+#
+#   Called in response to a USR2 signal.
+#   - Reread hosts.tab
+#   - All children connected to hosts that were removed from hosts.tab
+#     are killed via SIGINT
+#   - All children connected to previously existing hosts are sent SIGUSR1
+#   - Our internal hosts hash is updated to reflect the new contents of
+#     hosts.tab causing connections from hosts added to hosts.tab to
+#     now be honored.
+#
+sub UpdateHosts {
+}
+
+sub checkchildren {
+    &initnewstatus();
+    &logstatus();
+    &logthis('Going to check on the children');
+    my $docdir=$perlvar{'lonDocRoot'};
+    foreach (sort keys %children) {
+	sleep 1;
+        unless (kill 'USR1' => $_) {
+	    &logthis ('Child '.$_.' is dead');
+            &logstatus($$.' is dead');
+        } 
+    }
+    sleep 5;
+    $SIG{ALRM} = sub { die "timeout" };
+    $SIG{__DIE__} = 'DEFAULT';
+    foreach (sort keys %children) {
+        unless (-e "$docdir/lon-status/londchld/$_.txt") {
+          eval {
+            alarm(300);
+	    &logthis('Child '.$_.' did not respond');
+	    kill 9 => $_;
+	    #$emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+	    #$subj="LON: $currenthostid killed lond process $_";
+	    #my $result=`echo 'Killed lond process $_.' | mailto $emailto -s '$subj' > /dev/null`;
+	    #$execdir=$perlvar{'lonDaemons'};
+	    #$result=`/bin/cp $execdir/logs/lond.log $execdir/logs/lond.log.$_`;
+	    alarm(0);
+	  }
+        }
+    }
+    $SIG{ALRM} = 'DEFAULT';
+    $SIG{__DIE__} = \&cathcexception;
+}
+
 # --------------------------------------------------------------------- Logging
 
 sub logthis {
@@ -134,9 +569,55 @@ sub logthis {
     my $fh=IO::File->new(">>$execdir/logs/lond.log");
     my $now=time;
     my $local=localtime($now);
+    $lastlog=$local.': '.$message;
     print $fh "$local ($$): $message\n";
 }
 
+# ------------------------- Conditional log if $DEBUG true.
+sub Debug {
+    my $message = shift;
+    if($DEBUG) {
+	&logthis($message);
+    }
+}
+# ------------------------------------------------------------------ Log status
+
+sub logstatus {
+    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();
+    }
+    {
+	my $fh=IO::File->new(">$docdir/lon-status/londchld/$$.txt");
+        print $fh $status."\n".$lastlog."\n".time;
+        $fh->close();
+    }
+}
+
+sub initnewstatus {
+    my $docdir=$perlvar{'lonDocRoot'};
+    my $fh=IO::File->new(">$docdir/lon-status/londstatus.txt");
+    my $now=time;
+    my $local=localtime($now);
+    print $fh "LOND status $local - parent $$\n\n";
+    opendir(DIR,"$docdir/lon-status/londchld");
+    while (my $filename=readdir(DIR)) {
+        unlink("$docdir/lon-status/londchld/$filename");
+    }
+    closedir(DIR);
+}
+
+# -------------------------------------------------------------- Status setting
+
+sub status {
+    my $what=shift;
+    my $now=time;
+    my $local=localtime($now);
+    $status=$local.': '.$what;
+    $0='lond: '.$what.' '.$local;
+}
 
 # -------------------------------------------------------- Escape Special Chars
 
@@ -166,13 +647,6 @@ sub reconlonc {
         if (kill 0 => $loncpid) {
 	    &logthis("lonc at pid $loncpid responding, sending USR1");
             kill USR1 => $loncpid;
-            sleep 1;
-            if (-e "$peerfile") { return; }
-            &logthis("$peerfile still not there, give it another try");
-            sleep 5;
-            if (-e "$peerfile") { return; }
-            &logthis(
- "<font color=blue>WARNING: $peerfile still not there, giving up</font>");
         } else {
 	    &logthis(
               "<font color=red>CRITICAL: "
@@ -202,11 +676,12 @@ sub subreply {
 sub reply {
   my ($cmd,$server)=@_;
   my $answer;
-  if ($server ne $perlvar{'lonHostID'}) { 
+  if ($server ne $currenthostid) { 
     $answer=subreply($cmd,$server);
     if ($answer eq 'con_lost') {
 	$answer=subreply("ping",$server);
         if ($answer ne $server) {
+	    &logthis("sub reply: answer != server answer is $answer, server is $server");
            &reconlonc("$perlvar{'lonSockDir'}/$server");
         }
         $answer=subreply($cmd,$server);
@@ -270,7 +745,7 @@ sub ishome {
 # ======================================================= Continue main program
 # ---------------------------------------------------- Fork once and dissociate
 
-$fpid=fork;
+my $fpid=fork;
 exit if $fpid;
 die "Couldn't fork: $!" unless defined ($fpid);
 
@@ -278,43 +753,47 @@ POSIX::setsid() or die "Can't start new
 
 # ------------------------------------------------------- Write our PID on disk
 
-$execdir=$perlvar{'lonDaemons'};
+my $execdir=$perlvar{'lonDaemons'};
 open (PIDSAVE,">$execdir/logs/lond.pid");
 print PIDSAVE "$$\n";
 close(PIDSAVE);
 &logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
+&status('Starting');
+
 
-# ------------------------------------------------------- Now we are on our own
-    
-# Fork off our children.
-for (1 .. $PREFORK) {
-    make_new_child();
-}
 
 # ----------------------------------------------------- Install signal handlers
 
+
 $SIG{CHLD} = \&REAPER;
 $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;
 $SIG{HUP}  = \&HUPSMAN;
+$SIG{USR1} = \&checkchildren;
+$SIG{USR2} = \&UpdateHosts;
+
+
+# --------------------------------------------------------------
+#   Accept connections.  When a connection comes in, it is validated
+#   and if good, a child process is created to process transactions
+#   along the connection.
 
-# And maintain the population.
 while (1) {
-    sleep;                          # wait for a signal (i.e., child's death)
-    for ($i = $children; $i < $PREFORK; $i++) {
-        make_new_child();           # top up the child pool
-    }
+    $client = $server->accept() or next;
+    make_new_child($client);
 }
 
 sub make_new_child {
     my $pid;
     my $cipher;
     my $sigset;
+
+    $client = shift;
     &logthis("Attempting to start child");    
     # block signal for fork
     $sigset = POSIX::SigSet->new(SIGINT);
     sigprocmask(SIG_BLOCK, $sigset)
         or die "Can't block SIGINT for fork: $!\n";
-    
+
     die "fork: $!" unless defined ($pid = fork);
     
     if ($pid) {
@@ -323,38 +802,53 @@ sub make_new_child {
             or die "Can't unblock SIGINT for fork: $!\n";
         $children{$pid} = 1;
         $children++;
+        &status('Started child '.$pid);
         return;
     } else {
         # Child can *not* return from this subroutine.
         $SIG{INT} = 'DEFAULT';      # make SIGINT kill us as it did before
-    
+        $SIG{CHLD} = 'DEFAULT'; #make this default so that pwauth returns 
+                                #don't get intercepted
+        $SIG{USR1}= \&logstatus;
+        $SIG{ALRM}= \&timeout;
+        $lastlog='Forked ';
+        $status='Forked';
+
         # unblock signals
         sigprocmask(SIG_UNBLOCK, $sigset)
             or die "Can't unblock SIGINT for fork: $!\n";
 
-        $tmpsnum=0;
-    
-        # handle connections until we've reached $MAX_CLIENTS_PER_CHILD
-        for ($i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
-            $client = $server->accept()     or last;
+        my $tmpsnum=0;
+#---------------------------------------------------- kerberos 5 initialization
+        &Authen::Krb5::init_context();
+        &Authen::Krb5::init_ets();
 
+            &status('Accepted connection');
 # =============================================================================
             # do something with the connection
 # -----------------------------------------------------------------------------
+	    $client->sockopt(SO_KEEPALIVE, 1);# Enable monitoring of
+	                                      # connection liveness.
             # see if we know client and check for spoof IP by challenge
-            my $caller=getpeername($client);
+		my $caller = getpeername($client);
             my ($port,$iaddr)=unpack_sockaddr_in($caller);
-            my $clientip=inet_ntoa($iaddr);
+            $clientip=inet_ntoa($iaddr);
             my $clientrec=($hostid{$clientip} ne undef);
             &logthis(
-"<font color=yellow>INFO: Connect from $clientip ($hostid{$clientip})</font>");
+"<font color=yellow>INFO: Connection, $clientip ($hostid{$clientip})</font>"
+            );
+            &status("Connecting $clientip ($hostid{$clientip})"); 
             my $clientok;
             if ($clientrec) {
+	      &status("Waiting for init from $clientip ($hostid{$clientip})");
 	      my $remotereq=<$client>;
-              $remotereq=~s/\W//g;
-              if ($remotereq eq 'init') {
+              $remotereq=~s/[^\w:]//g;
+              if ($remotereq =~ /^init/) {
+		  &sethost("sethost:$perlvar{'lonHostID'}");
 		  my $challenge="$$".time;
                   print $client "$challenge\n";
+                  &status(
+           "Waiting for challenge reply from $clientip ($hostid{$clientip})"); 
                   $remotereq=<$client>;
                   $remotereq=~s/\W//g;
                   if ($challenge eq $remotereq) {
@@ -363,28 +857,39 @@ sub make_new_child {
                   } else {
 		      &logthis(
  "<font color=blue>WARNING: $clientip did not reply challenge</font>");
-                      print $client "bye\n";
+                      &status('No challenge reply '.$clientip);
                   }
               } else {
 		  &logthis(
                     "<font color=blue>WARNING: "
                    ."$clientip failed to initialize: >$remotereq< </font>");
-		  print $client "bye\n";
+                  &status('No init '.$clientip);
               }
 	    } else {
               &logthis(
  "<font color=blue>WARNING: Unknown client $clientip</font>");
-              print $client "bye\n";
+              &status('Hung up on '.$clientip);
             }
             if ($clientok) {
 # ---------------- New known client connecting, could mean machine online again
-	      &reconlonc("$perlvar{'lonSockDir'}/$hostid{$clientip}");
-              &logthis(
-       "<font color=green>Established connection: $hostid{$clientip}</font>");
+
+		foreach my $id (keys(%hostip)) {
+		    if ($hostip{$id} ne $clientip ||
+		       $hostip{$currenthostid} eq $clientip) {
+			# no need to try to do recon's to myself
+			next;
+		    }
+		    &reconlonc("$perlvar{'lonSockDir'}/$id");
+		}
+		&logthis("<font color=green>Established connection: $hostid{$clientip}</font>");
+              &status('Will listen to '.$hostid{$clientip});
 # ------------------------------------------------------------ Process requests
               while (my $userinput=<$client>) {
                 chomp($userinput);
+		Debug("Request = $userinput\n");
+                &status('Processing '.$hostid{$clientip}.': '.$userinput);
                 my $wasenc=0;
+                alarm(120);
 # ------------------------------------------------------------ See if encrypted
 		if ($userinput =~ /^enc/) {
 		  if ($cipher) {
@@ -398,22 +903,23 @@ sub make_new_child {
 		    }
 		    $userinput=substr($userinput,0,$cmdlength);
                     $wasenc=1;
-		  }
 		}
+	      }
+	  
 # ------------------------------------------------------------- Normal commands
 # ------------------------------------------------------------------------ ping
 		   if ($userinput =~ /^ping/) {
-                       print $client "$perlvar{'lonHostID'}\n";
+                       print $client "$currenthostid\n";
 # ------------------------------------------------------------------------ pong
-		   } elsif ($userinput =~ /^pong/) {
-                       $reply=reply("ping",$hostid{$clientip});
-                       print $client "$perlvar{'lonHostID'}:$reply\n"; 
+		   }elsif ($userinput =~ /^pong/) {
+                       my $reply=&reply("ping",$hostid{$clientip});
+                       print $client "$currenthostid:$reply\n"; 
 # ------------------------------------------------------------------------ ekey
 		   } elsif ($userinput =~ /^ekey/) {
                        my $buildkey=time.$$.int(rand 100000);
                        $buildkey=~tr/1-6/A-F/;
                        $buildkey=int(rand 100000).$buildkey.int(rand 100000);
-                       my $key=$perlvar{'lonHostID'}.$hostid{$clientip};
+                       my $key=$currenthostid.$hostid{$clientip};
                        $key=~tr/a-z/A-Z/;
                        $key=~tr/G-P/0-9/;
                        $key=~tr/Q-Z/0-9/;
@@ -430,8 +936,56 @@ sub make_new_child {
                           $loadavg=<$loadfile>;
                        }
                        $loadavg =~ s/\s.*//g;
-                       my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
+		       my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
 		       print $client "$loadpercent\n";
+# -------------------------------------------------------------------- userload
+		   } elsif ($userinput =~ /^userload/) {
+		       my $userloadpercent=&userload();
+		       print $client "$userloadpercent\n";
+
+#
+#        Transactions requiring encryption:
+#
+# ----------------------------------------------------------------- currentauth
+		   } elsif ($userinput =~ /^currentauth/) {
+		     if ($wasenc==1) {
+                       my ($cmd,$udom,$uname)=split(/:/,$userinput);
+		       my $result = GetAuthType($udom, $uname);
+		       if($result eq "nouser") {
+			   print $client "unknown_user\n";
+		       }
+		       else {
+			   print $client "$result\n"
+		       }
+		     } else {
+		       print $client "refused\n";
+		     }
+#--------------------------------------------------------------------- pushfile
+		   } elsif($userinput =~ /^pushfile/) { 
+		       if($wasenc == 1) {
+			   my $cert = GetCertificate($userinput);
+			   if(ValidManager($cert)) {
+			       my $reply = PushFile($userinput);
+			       print $client "$reply\n";
+			   } else {
+			       print $client "refused\n";
+			   } 
+		       } else {
+			   print $client "refused\n";
+		       }
+#--------------------------------------------------------------------- reinit
+		   } elsif($userinput =~ /^reinit/) {
+		       if ($wasenc == 1) {
+			   my $cert = GetCertificate($userinput);
+			   if(ValidManager($cert)) {
+			       my $reply = ReinitProcess($userinput);
+			       print $client  "$reply\n";
+			   } else {
+			       print $client "refused\n";
+			   }
+		       } else {
+			   print $client "refused\n";
+		       }
 # ------------------------------------------------------------------------ auth
                    } elsif ($userinput =~ /^auth/) {
 		     if ($wasenc==1) {
@@ -447,18 +1001,68 @@ sub make_new_child {
                           my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
                           my $pwdcorrect=0;
                           if ($howpwd eq 'internal') {
+			      &Debug("Internal auth");
 			      $pwdcorrect=
 				  (crypt($upass,$contentpwd) eq $contentpwd);
                           } elsif ($howpwd eq 'unix') {
-                              $contentpwd=(getpwnam($uname))[1];
-                              $pwdcorrect=
-                                  (crypt($upass,$contentpwd) eq $contentpwd);
+			      &Debug("Unix auth");
+                              if((getpwnam($uname))[1] eq "") { #no such user!
+				  $pwdcorrect = 0;
+			      } else {
+				  $contentpwd=(getpwnam($uname))[1];
+				  my $pwauth_path="/usr/local/sbin/pwauth";
+				  unless ($contentpwd eq 'x') {
+				      $pwdcorrect=
+					  (crypt($upass,$contentpwd) eq 
+					   $contentpwd);
+				  }
+		  
+			      elsif (-e $pwauth_path) {
+				  open PWAUTH, "|$pwauth_path" or
+				      die "Cannot invoke authentication";
+				  print PWAUTH "$uname\n$upass\n";
+				  close PWAUTH;
+				  $pwdcorrect=!$?;
+			      }
+			      }
                           } elsif ($howpwd eq 'krb4') {
-                              $pwdcorrect=(
-                                 Authen::Krb4::get_pw_in_tkt($uname,"",
-                                        $contentpwd,'krbtgt',$contentpwd,1,
-							     $upass) == 0);
-                          }
+                              my $null=pack("C",0);
+                              unless ($upass=~/$null/) {
+                                  my $krb4_error = &Authen::Krb4::get_pw_in_tkt
+                                      ($uname,"",$contentpwd,'krbtgt',
+                                       $contentpwd,1,$upass);
+                                  if (!$krb4_error) {
+                                      $pwdcorrect = 1;
+                                  } else { 
+                                      $pwdcorrect=0; 
+                                      # log error if it is not a bad password
+                                      if ($krb4_error != 62) {
+       &logthis('krb4:'.$uname.','.$contentpwd.','.
+                &Authen::Krb4::get_err_txt($Authen::Krb4::error));
+                                      }
+                                  }
+                              }
+                          } elsif ($howpwd eq 'krb5') {
+			      my $null=pack("C",0);
+			      unless ($upass=~/$null/) {
+				  my $krbclient=&Authen::Krb5::parse_name($uname.'@'.$contentpwd);
+				  my $krbservice="krbtgt/".$contentpwd."\@".$contentpwd;
+				  my $krbserver=&Authen::Krb5::parse_name($krbservice);
+				  my $credentials=&Authen::Krb5::cc_default();
+				  $credentials->initialize($krbclient);
+				  my $krbreturn = 
+				    &Authen::Krb5::get_in_tkt_with_password(
+				     $krbclient,$krbserver,$upass,$credentials);
+#				  unless ($krbreturn) {
+#				      &logthis("Krb5 Error: ".
+#					       &Authen::Krb5::error());
+#				  }
+				  $pwdcorrect = ($krbreturn == 1);
+			   } else { $pwdcorrect=0; }
+                          } elsif ($howpwd eq 'localauth') {
+			    $pwdcorrect=&localauth::localauth($uname,$upass,
+							      $contentpwd);
+			  }
                           if ($pwdcorrect) {
                              print $client "authorized\n";
                           } else {
@@ -476,7 +1080,10 @@ sub make_new_child {
                        my 
                        ($cmd,$udom,$uname,$upass,$npass)=split(/:/,$userinput);
                        chomp($npass);
-                       my $proname=propath($udom,$uname);
+                       $upass=&unescape($upass);
+                       $npass=&unescape($npass);
+		       &Debug("Trying to change password for $uname");
+		       my $proname=propath($udom,$uname);
                        my $passfilename="$proname/passwd";
                        if (-e $passfilename) {
 			   my $realpasswd;
@@ -485,17 +1092,62 @@ sub make_new_child {
                           chomp($realpasswd);
                           my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
                           if ($howpwd eq 'internal') {
+			   &Debug("internal auth");
 			   if (crypt($upass,$contentpwd) eq $contentpwd) {
 			     my $salt=time;
                              $salt=substr($salt,6,2);
 			     my $ncpass=crypt($npass,$salt);
-                             { my $pf = IO::File->new(">$passfilename");
- 	  		       print $pf "internal:$ncpass\n";; }             
-                             print $client "ok\n";
+                             {
+				 my $pf;
+				 if ($pf = IO::File->new(">$passfilename")) {
+				     print $pf "internal:$ncpass\n";
+				     &logthis("Result of password change for $uname: pwchange_success");
+				     print $client "ok\n";
+				 } else {
+				     &logthis("Unable to open $uname passwd to change password");
+				     print $client "non_authorized\n";
+				 }
+			     }             
+			     
                            } else {
                              print $client "non_authorized\n";
                            }
-                          } else {
+                          } elsif ($howpwd eq 'unix') {
+			      # Unix means we have to access /etc/password
+			      # one way or another.
+			      # First: Make sure the current password is
+			      #        correct
+			      &Debug("auth is unix");
+			      $contentpwd=(getpwnam($uname))[1];
+			      my $pwdcorrect = "0";
+			      my $pwauth_path="/usr/local/sbin/pwauth";
+			      unless ($contentpwd eq 'x') {
+				  $pwdcorrect=
+                                    (crypt($upass,$contentpwd) eq $contentpwd);
+			      } elsif (-e $pwauth_path) {
+				  open PWAUTH, "|$pwauth_path" or
+				      die "Cannot invoke authentication";
+				  print PWAUTH "$uname\n$upass\n";
+				  close PWAUTH;
+				  &Debug("exited pwauth with $? ($uname,$upass) ");
+				  $pwdcorrect=($? == 0);
+			      }
+			     if ($pwdcorrect) {
+				 my $execdir=$perlvar{'lonDaemons'};
+				 &Debug("Opening lcpasswd pipeline");
+				 my $pf = IO::File->new("|$execdir/lcpasswd > $perlvar{'lonDaemons'}/logs/lcpasswd.log");
+				 print $pf "$uname\n$npass\n$npass\n";
+				 close $pf;
+				 my $err = $?;
+				 my $result = ($err>0 ? 'pwchange_failure' 
+					       : 'ok');
+				 &logthis("Result of password change for $uname: ".
+					  &lcpasswdstrerror($?));
+				 print $client "$result\n";
+			     } else {
+				 print $client "non_authorized\n";
+			     }
+			  } else {
                             print $client "auth_mode_error\n";
                           }  
 		       } else {
@@ -504,6 +1156,73 @@ sub make_new_child {
 		     } else {
 		       print $client "refused\n";
 		     }
+# -------------------------------------------------------------------- makeuser
+                   } elsif ($userinput =~ /^makeuser/) {
+		     &Debug("Make user received");
+    	             my $oldumask=umask(0077);
+		     if ($wasenc==1) {
+                       my 
+                       ($cmd,$udom,$uname,$umode,$npass)=split(/:/,$userinput);
+		       &Debug("cmd =".$cmd." $udom =".$udom.
+				    " uname=".$uname);
+                       chomp($npass);
+                       $npass=&unescape($npass);
+                       my $proname=propath($udom,$uname);
+                       my $passfilename="$proname/passwd";
+		       &Debug("Password file created will be:".
+				    $passfilename);
+                       if (-e $passfilename) {
+			   print $client "already_exists\n";
+                       } elsif ($udom ne $currentdomainid) {
+                           print $client "not_right_domain\n";
+                       } else {
+                           my @fpparts=split(/\//,$proname);
+                           my $fpnow=$fpparts[0].'/'.$fpparts[1].'/'.$fpparts[2];
+                           my $fperror='';
+                           for (my $i=3;$i<=$#fpparts;$i++) {
+                               $fpnow.='/'.$fpparts[$i]; 
+                               unless (-e $fpnow) {
+				   unless (mkdir($fpnow,0777)) {
+                                      $fperror="error: ".($!+0)
+					  ." mkdir failed while attempting "
+                                              ."makeuser\n";
+                                   }
+                               }
+                           }
+                           unless ($fperror) {
+			       my $result=&make_passwd_file($uname, $umode,$npass,
+							    $passfilename);
+			       print $client $result;
+                           } else {
+                               print $client "$fperror\n";
+                           }
+                       }
+		     } else {
+		       print $client "refused\n";
+		     }
+		     umask($oldumask);
+# -------------------------------------------------------------- changeuserauth
+                   } elsif ($userinput =~ /^changeuserauth/) {
+		       &Debug("Changing authorization");
+		      if ($wasenc==1) {
+                       my 
+		       ($cmd,$udom,$uname,$umode,$npass)=split(/:/,$userinput);
+                       chomp($npass);
+		       &Debug("cmd = ".$cmd." domain= ".$udom.
+			      "uname =".$uname." umode= ".$umode);
+                       $npass=&unescape($npass);
+                       my $proname=&propath($udom,$uname);
+                       my $passfilename="$proname/passwd";
+		       if ($udom ne $currentdomainid) {
+                           print $client "not_right_domain\n";
+                       } else {
+			   my $result=&make_passwd_file($uname, $umode,$npass,
+							$passfilename);
+			   print $client $result;
+                       }
+		     } else {
+		       print $client "refused\n";
+		     }
 # ------------------------------------------------------------------------ home
                    } elsif ($userinput =~ /^home/) {
                        my ($cmd,$udom,$uname)=split(/:/,$userinput);
@@ -524,11 +1243,11 @@ sub make_new_child {
                               $uid,$gid,$rdev,$size,
                               $atime,$mtime,$ctime,
                               $blksize,$blocks)=stat($fname);
-                          $now=time;
-                          $since=$now-$atime;
+                          my $now=time;
+                          my $since=$now-$atime;
                           if ($since>$perlvar{'lonExpire'}) {
-                              $reply=
-                                    reply("unsub:$fname","$hostid{$clientip}");
+                              my $reply=
+                                    &reply("unsub:$fname","$hostid{$clientip}");
                               unlink("$fname");
                           } else {
 			     my $transname="$fname.in.transfer";
@@ -566,45 +1285,65 @@ sub make_new_child {
 		       } else {
 			print $client "rejected\n";
                        }
+# -------------------------------------- fetch a user file from a remote server
+                   } elsif ($userinput =~ /^fetchuserfile/) {
+                      my ($cmd,$fname)=split(/:/,$userinput);
+		      my ($udom,$uname,$ufile)=split(/\//,$fname);
+                      my $udir=propath($udom,$uname).'/userfiles';
+                      unless (-e $udir) { mkdir($udir,0770); }
+                       if (-e $udir) {
+                       $ufile=~s/^[\.\~]+//;
+                       $ufile=~s/\///g;
+                       my $transname=$udir.'/'.$ufile;
+                       my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
+                             my $response;
+                              {
+                             my $ua=new LWP::UserAgent;
+                             my $request=new HTTP::Request('GET',"$remoteurl");
+                             $response=$ua->request($request,$transname);
+			      }
+                             if ($response->is_error()) {
+				 unlink($transname);
+                                 my $message=$response->status_line;
+                                 &logthis(
+                                  "LWP GET: $message for $fname ($remoteurl)");
+				 print $client "failed\n";
+                             } else {
+                                 print $client "ok\n";
+                             }
+                     } else {
+                       print $client "not_home\n";
+                     } 
+# ------------------------------------------ authenticate access to a user file
+                   } elsif ($userinput =~ /^tokenauthuserfile/) {
+                       my ($cmd,$fname,$session)=split(/:/,$userinput);
+                       chomp($session);
+                       my $reply='non_auth';
+                       if (open(ENVIN,$perlvar{'lonIDsDir'}.'/'.
+				$session.'.id')) {
+			   while (my $line=<ENVIN>) {
+			       if ($line=~/userfile\.$fname\=/) { $reply='ok'; }
+			   }
+			   close(ENVIN);
+			   print $client $reply."\n";
+		       } else {
+			   print $client "invalid_token\n";
+                       }
 # ----------------------------------------------------------------- unsubscribe
                    } elsif ($userinput =~ /^unsub/) {
                        my ($cmd,$fname)=split(/:/,$userinput);
                        if (-e $fname) {
-                           if (unlink("$fname.$hostid{$clientip}")) {
-                              print $client "ok\n";
-			   } else {
-                              print $client "not_subscribed\n";
-			   }
+			   print $client &unsub($client,$fname,$clientip);
                        } else {
 			   print $client "not_found\n";
                        }
 # ------------------------------------------------------------------- subscribe
                    } elsif ($userinput =~ /^sub/) {
+		       print $client &subscribe($userinput,$clientip);
+# ------------------------------------------------------------- current version
+                   } elsif ($userinput =~ /^currentversion/) {
                        my ($cmd,$fname)=split(/:/,$userinput);
-                       my $ownership=ishome($fname);
-                       if ($ownership eq 'owner') {
-                        if (-e $fname) {
-			 if (-d $fname) {
-			   print $client "directory\n";
-                         } else {
-                           $now=time;
-                           { 
-			    my $sh;
-                            if ($sh=
-                             IO::File->new(">$fname.$hostid{$clientip}")) {
-                               print $sh "$clientip:$now\n";
-			    }
-			   }
-                           $fname=~s/\/home\/httpd\/html\/res/raw/;
-                           $fname="http://$thisserver/".$fname;
-                           print $client "$fname\n";
-		         }
-                        } else {
-		      	   print $client "not_found\n";
-                        }
-		       } else {
-                        print $client "rejected\n";
-		       }
+		       print $client &currentversion($fname)."\n";
 # ------------------------------------------------------------------------- log
                    } elsif ($userinput =~ /^log/) {
                        my ($cmd,$udom,$uname,$what)=split(/:/,$userinput);
@@ -617,7 +1356,9 @@ sub make_new_child {
                             print $hfh "$now:$hostid{$clientip}:$what\n";
                             print $client "ok\n"; 
 			} else {
-                            print $client "error:$!\n";
+                            print $client "error: ".($!+0)
+				." IO::File->new Failed "
+                                    ."while attempting log\n";
 		        }
 		       }
 # ------------------------------------------------------------------------- put
@@ -630,34 +1371,43 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
 			       ) { print $hfh "P:$now:$what\n"; }
 		       }
                        my @pairs=split(/\&/,$what);
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
-                           foreach $pair (@pairs) {
-			       ($key,$value)=split(/=/,$pair);
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+                           foreach my $pair (@pairs) {
+			       my ($key,$value)=split(/=/,$pair);
                                $hash{$key}=$value;
                            }
 			   if (untie(%hash)) {
                               print $client "ok\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) failed ".
+                                      "while attempting put\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting put\n";
                        }
 		      } else {
                           print $client "refused\n";
                       }
 # -------------------------------------------------------------------- rolesput
                    } elsif ($userinput =~ /^rolesput/) {
+		       &Debug("rolesput");
 		    if ($wasenc==1) {
                        my ($cmd,$exedom,$exeuser,$udom,$uname,$what)
                           =split(/:/,$userinput);
+		       &Debug("cmd = ".$cmd." exedom= ".$exedom.
+				    "user = ".$exeuser." udom=".$udom.
+				    "what = ".$what);
                        my $namespace='roles';
                        chomp($what);
                        my $proname=propath($udom,$uname);
@@ -671,18 +1421,68 @@ sub make_new_child {
                                  }
 		       }
                        my @pairs=split(/\&/,$what);
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
-                           foreach $pair (@pairs) {
-			       ($key,$value)=split(/=/,$pair);
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+                           foreach my $pair (@pairs) {
+			       my ($key,$value)=split(/=/,$pair);
+			       &ManagePermissions($key, $udom, $uname,
+						  &GetAuthType( $udom, 
+								$uname));
                                $hash{$key}=$value;
                            }
 			   if (untie(%hash)) {
                               print $client "ok\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting rolesput\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting rolesput\n";
+                       }
+		      } else {
+                          print $client "refused\n";
+                      }
+# -------------------------------------------------------------------- rolesdel
+                   } elsif ($userinput =~ /^rolesdel/) {
+		       &Debug("rolesdel");
+		    if ($wasenc==1) {
+                       my ($cmd,$exedom,$exeuser,$udom,$uname,$what)
+                          =split(/:/,$userinput);
+		       &Debug("cmd = ".$cmd." exedom= ".$exedom.
+				    "user = ".$exeuser." udom=".$udom.
+				    "what = ".$what);
+                       my $namespace='roles';
+                       chomp($what);
+                       my $proname=propath($udom,$uname);
+                       my $now=time;
+                       {
+			   my $hfh;
+			   if (
+                             $hfh=IO::File->new(">>$proname/$namespace.hist")
+			       ) { 
+                                  print $hfh "D:$now:$exedom:$exeuser:$what\n";
+                                 }
+		       }
+                       my @rolekeys=split(/\&/,$what);
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+                           foreach my $key (@rolekeys) {
+                               delete $hash{$key};
+                           }
+			   if (untie(%hash)) {
+                              print $client "ok\n";
+                           } else {
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting rolesdel\n";
+                           }
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting rolesdel\n";
                        }
 		      } else {
                           print $client "refused\n";
@@ -697,18 +1497,28 @@ sub make_new_child {
                        my @queries=split(/\&/,$what);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
-                           for ($i=0;$i<=$#queries;$i++) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+                           for (my $i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
 			   if (untie(%hash)) {
 		              $qresult=~s/\&$//;
                               print $client "$qresult\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting get\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           if ($!+0 == 2) {
+                               print $client "error:No such file or ".
+                                   "GDBM reported bad block error\n";
+                           } else {
+                               print $client "error: ".($!+0)
+                                   ." tie(GDBM) Failed ".
+                                       "while attempting get\n";
+                           }
                        }
 # ------------------------------------------------------------------------ eget
                    } elsif ($userinput =~ /^eget/) {
@@ -720,8 +1530,9 @@ sub make_new_child {
                        my @queries=split(/\&/,$what);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
-                           for ($i=0;$i<=$#queries;$i++) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+                           for (my $i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
 			   if (untie(%hash)) {
@@ -741,10 +1552,14 @@ sub make_new_child {
 			        print $client "error:no_key\n";
                               }
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting eget\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting eget\n";
                        }
 # ------------------------------------------------------------------------- del
                    } elsif ($userinput =~ /^del/) {
@@ -755,24 +1570,29 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
 			       ) { print $hfh "D:$now:$what\n"; }
 		       }
                        my @keys=split(/\&/,$what);
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
-                           foreach $key (@keys) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+                           foreach my $key (@keys) {
                                delete($hash{$key});
                            }
 			   if (untie(%hash)) {
                               print $client "ok\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting del\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting del\n";
                        }
 # ------------------------------------------------------------------------ keys
                    } elsif ($userinput =~ /^keys/) {
@@ -782,39 +1602,108 @@ sub make_new_child {
                        $namespace=~s/\W//g;
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
-                           foreach $key (keys %hash) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+                           foreach my $key (keys %hash) {
                                $qresult.="$key&";
                            }
 			   if (untie(%hash)) {
 		              $qresult=~s/\&$//;
                               print $client "$qresult\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting keys\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting keys\n";
                        }
-# ------------------------------------------------------------------------ dump
-                   } elsif ($userinput =~ /^dump/) {
+# ----------------------------------------------------------------- dumpcurrent
+                   } elsif ($userinput =~ /^currentdump/) {
                        my ($cmd,$udom,$uname,$namespace)
                           =split(/:/,$userinput);
                        $namespace=~s/\//\_/g;
                        $namespace=~s/\W//g;
-                       my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
-                           foreach $key (keys %hash) {
-                               $qresult.="$key=$hash{$key}&";
+                       my $proname=propath($udom,$uname);
+		       my %hash;
+                       if (tie(%hash,'GDBM_File',
+                               "$proname/$namespace.db",
+                               &GDBM_READER(),0640)) {
+                           # Structure of %data:
+                           # $data{$symb}->{$parameter}=$value;
+                           # $data{$symb}->{'v.'.$parameter}=$version;
+                           # since $parameter will be unescaped, we do not
+                           # have to worry about silly parameter names...
+                           my %data = ();
+                           while (my ($key,$value) = each(%hash)) {
+                              my ($v,$symb,$param) = split(/:/,$key);
+                              next if ($v eq 'version' || $symb eq 'keys');
+                              next if (exists($data{$symb}) && 
+                                       exists($data{$symb}->{$param}) &&
+                                       $data{$symb}->{'v.'.$param} > $v);
+                              $data{$symb}->{$param}=$value;
+                              $data{$symb}->{'v.'.$param}=$v;
+                           }
+                           if (untie(%hash)) {
+                             while (my ($symb,$param_hash) = each(%data)) {
+                               while(my ($param,$value) = each (%$param_hash)){
+                                 next if ($param =~ /^v\./);
+                                 $qresult.=$symb.':'.$param.'='.$value.'&';
+                               }
+                             }
+                             chop($qresult);
+                             print $client "$qresult\n";
+                           } else {
+                             print $client "error: ".($!+0)
+				 ." untie(GDBM) Failed ".
+                                     "while attempting currentdump\n";
                            }
-			   if (untie(%hash)) {
-		              $qresult=~s/\&$//;
-                              print $client "$qresult\n";
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting currentdump\n";
+                       }
+# ------------------------------------------------------------------------ dump
+                   } elsif ($userinput =~ /^dump/) {
+                       my ($cmd,$udom,$uname,$namespace,$regexp)
+                          =split(/:/,$userinput);
+                       $namespace=~s/\//\_/g;
+                       $namespace=~s/\W//g;
+                       if (defined($regexp)) {
+                          $regexp=&unescape($regexp);
+		       } else {
+                          $regexp='.';
+		       }
+                       my $qresult='';
+                       my $proname=propath($udom,$uname);
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+                           study($regexp);
+                           while (my ($key,$value) = each(%hash)) {
+                               if ($regexp eq '.') {
+                                   $qresult.=$key.'='.$value.'&';
+                               } else {
+                                   my $unescapeKey = &unescape($key);
+                                   if (eval('$unescapeKey=~/$regexp/')) {
+                                       $qresult.="$key=$value&";
+                                   }
+                               }
+                           }
+                           if (untie(%hash)) {
+                               chop($qresult);
+                               print $client "$qresult\n";
                            } else {
-                              print $client "error:$!\n";
+                               print $client "error: ".($!+0)
+				   ." untie(GDBM) Failed ".
+                                       "while attempting dump\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting dump\n";
                        }
 # ----------------------------------------------------------------------- store
                    } elsif ($userinput =~ /^store/) {
@@ -826,34 +1715,39 @@ sub make_new_child {
                        chomp($what);
                        my $proname=propath($udom,$uname);
                        my $now=time;
-                       {
+                       unless ($namespace=~/^nohist\_/) {
 			   my $hfh;
 			   if (
                              $hfh=IO::File->new(">>$proname/$namespace.hist")
 			       ) { print $hfh "P:$now:$rid:$what\n"; }
 		       }
                        my @pairs=split(/\&/,$what);
-                         
-    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT,0640)) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
                            my @previouskeys=split(/&/,$hash{"keys:$rid"});
                            my $key;
                            $hash{"version:$rid"}++;
                            my $version=$hash{"version:$rid"};
                            my $allkeys=''; 
-                           foreach $pair (@pairs) {
-			       ($key,$value)=split(/=/,$pair);
+                           foreach my $pair (@pairs) {
+			       my ($key,$value)=split(/=/,$pair);
                                $allkeys.=$key.':';
                                $hash{"$version:$rid:$key"}=$value;
                            }
-                           $allkeys=~s/:$//;
+                           $hash{"$version:$rid:timestamp"}=$now;
+                           $allkeys.='timestamp';
                            $hash{"$version:keys:$rid"}=$allkeys;
 			   if (untie(%hash)) {
                               print $client "ok\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting store\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting store\n";
                        }
 		      } else {
                           print $client "refused\n";
@@ -867,7 +1761,8 @@ sub make_new_child {
                        chomp($rid);
                        my $proname=propath($udom,$uname);
                        my $qresult='';
-      if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER,0640)) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
                 	   my $version=$hash{"version:$rid"};
                            $qresult.="version=$version&";
                            my $scope;
@@ -884,29 +1779,124 @@ sub make_new_child {
 		              $qresult=~s/\&$//;
                               print $client "$qresult\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting restore\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting restore\n";
+                       }
+# -------------------------------------------------------------------- chatsend
+                   } elsif ($userinput =~ /^chatsend/) {
+                       my ($cmd,$cdom,$cnum,$newpost)=split(/\:/,$userinput);
+                       &chatadd($cdom,$cnum,$newpost);
+                       print $client "ok\n";
+# -------------------------------------------------------------------- chatretr
+                   } elsif ($userinput =~ /^chatretr/) {
+                       my 
+                        ($cmd,$cdom,$cnum,$udom,$uname)=split(/\:/,$userinput);
+                       my $reply='';
+                       foreach (&getchat($cdom,$cnum,$udom,$uname)) {
+			   $reply.=&escape($_).':';
                        }
+                       $reply=~s/\:$//;
+                       print $client $reply."\n";
 # ------------------------------------------------------------------- querysend
                    } elsif ($userinput =~ /^querysend/) {
-                       my ($cmd,$query)=split(/:/,$userinput);
+                       my ($cmd,$query,
+			   $arg1,$arg2,$arg3)=split(/\:/,$userinput);
 		       $query=~s/\n*$//g;
-                     print $client sqlreply("$hostid{$clientip}\&$query")."\n";
+		       print $client "".
+			       sqlreply("$hostid{$clientip}\&$query".
+					"\&$arg1"."\&$arg2"."\&$arg3")."\n";
 # ------------------------------------------------------------------ queryreply
                    } elsif ($userinput =~ /^queryreply/) {
                        my ($cmd,$id,$reply)=split(/:/,$userinput); 
 		       my $store;
                        my $execdir=$perlvar{'lonDaemons'};
                        if ($store=IO::File->new(">$execdir/tmp/$id")) {
+			   $reply=~s/\&/\n/g;
 			   print $store $reply;
 			   close $store;
+			   my $store2=IO::File->new(">$execdir/tmp/$id.end");
+			   print $store2 "done\n";
+			   close $store2;
 			   print $client "ok\n";
 		       }
 		       else {
-			   print $client "error:$!\n";
+			   print $client "error: ".($!+0)
+			       ." IO::File->new Failed ".
+                                   "while attempting queryreply\n";
+		       }
+# ----------------------------------------------------------------- courseidput
+                   } elsif ($userinput =~ /^courseidput/) {
+                       my ($cmd,$udom,$what)=split(/:/,$userinput);
+                       chomp($what);
+                       $udom=~s/\W//g;
+                       my $proname=
+                              "$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
+                       my $now=time;
+                       my @pairs=split(/\&/,$what);
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
+                           foreach my $pair (@pairs) {
+			       my ($key,$value)=split(/=/,$pair);
+                               $hash{$key}=$value.':'.$now;
+                           }
+			   if (untie(%hash)) {
+                              print $client "ok\n";
+                           } else {
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting courseidput\n";
+                           }
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting courseidput\n";
+                       }
+# ---------------------------------------------------------------- courseiddump
+                   } elsif ($userinput =~ /^courseiddump/) {
+                       my ($cmd,$udom,$since,$description)
+                          =split(/:/,$userinput);
+                       if (defined($description)) {
+                          $description=&unescape($description);
+		       } else {
+                          $description='.';
 		       }
+                       unless (defined($since)) { $since=0; }
+                       my $qresult='';
+                       my $proname=
+                              "$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
+                           while (my ($key,$value) = each(%hash)) {
+                               my ($descr,$lasttime)=split(/\:/,$value);
+                               if ($lasttime<$since) { next; }
+                               if ($description eq '.') {
+                                   $qresult.=$key.'='.$descr.'&';
+                               } else {
+                                   my $unescapeVal = &unescape($descr);
+                                   if (eval('$unescapeVal=~/$description/i')) {
+                                       $qresult.="$key=$descr&";
+                                   }
+                               }
+                           }
+                           if (untie(%hash)) {
+                               chop($qresult);
+                               print $client "$qresult\n";
+                           } else {
+                               print $client "error: ".($!+0)
+				   ." untie(GDBM) Failed ".
+                                       "while attempting courseiddump\n";
+                           }
+                       } else {
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting courseiddump\n";
+                       }
 # ----------------------------------------------------------------------- idput
                    } elsif ($userinput =~ /^idput/) {
                        my ($cmd,$udom,$what)=split(/:/,$userinput);
@@ -921,18 +1911,23 @@ sub make_new_child {
 			       ) { print $hfh "P:$now:$what\n"; }
 		       }
                        my @pairs=split(/\&/,$what);
-                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT,0640)) {
-                           foreach $pair (@pairs) {
-			       ($key,$value)=split(/=/,$pair);
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
+                           foreach my $pair (@pairs) {
+			       my ($key,$value)=split(/=/,$pair);
                                $hash{$key}=$value;
                            }
 			   if (untie(%hash)) {
                               print $client "ok\n";
                            } else {
-                              print $client "error:$!\n";
+                              print $client "error: ".($!+0)
+				  ." untie(GDBM) Failed ".
+                                      "while attempting idput\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                      "while attempting idput\n";
                        }
 # ----------------------------------------------------------------------- idget
                    } elsif ($userinput =~ /^idget/) {
@@ -942,18 +1937,23 @@ sub make_new_child {
                        my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
                        my @queries=split(/\&/,$what);
                        my $qresult='';
-                 if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER,0640)) {
-                           for ($i=0;$i<=$#queries;$i++) {
+		       my %hash;
+		       if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
+                           for (my $i=0;$i<=$#queries;$i++) {
                                $qresult.="$hash{$queries[$i]}&";
                            }
 			   if (untie(%hash)) {
-		              $qresult=~s/\&$//;
-                              print $client "$qresult\n";
+			       $qresult=~s/\&$//;
+			       print $client "$qresult\n";
                            } else {
-                              print $client "error:$!\n";
+			       print $client "error: ".($!+0)
+				   ." untie(GDBM) Failed ".
+				       "while attempting idget\n";
                            }
                        } else {
-                           print $client "error:$!\n";
+                           print $client "error: ".($!+0)
+			       ." tie(GDBM) Failed ".
+                                   "while attempting idget\n";
                        }
 # ---------------------------------------------------------------------- tmpput
                    } elsif ($userinput =~ /^tmpput/) {
@@ -970,7 +1970,9 @@ sub make_new_child {
 			   print $client "$id\n";
 		       }
 		       else {
-			   print $client "error:$!\n";
+			   print $client "error: ".($!+0)
+			       ."IO::File->new Failed ".
+                                   "while attempting tmpput\n";
 		       }
 
 # ---------------------------------------------------------------------- tmpget
@@ -986,51 +1988,784 @@ sub make_new_child {
                            close $store;
 		       }
 		       else {
-			   print $client "error:$!\n";
+			   print $client "error: ".($!+0)
+			       ."IO::File->new Failed ".
+                                   "while attempting tmpget\n";
 		       }
 
+# ---------------------------------------------------------------------- tmpdel
+                   } elsif ($userinput =~ /^tmpdel/) {
+                       my ($cmd,$id)=split(/:/,$userinput);
+                       chomp($id);
+                       $id=~s/\W/\_/g;
+                       my $execdir=$perlvar{'lonDaemons'};
+                       if (unlink("$execdir/tmp/$id.tmp")) {
+			   print $client "ok\n";
+		       } else {
+			   print $client "error: ".($!+0)
+			       ."Unlink tmp Failed ".
+                                   "while attempting tmpdel\n";
+		       }
 # -------------------------------------------------------------------------- ls
                    } elsif ($userinput =~ /^ls/) {
                        my ($cmd,$ulsdir)=split(/:/,$userinput);
                        my $ulsout='';
                        my $ulsfn;
                        if (-e $ulsdir) {
-                          while ($ulsfn=<$ulsdir/*>) {
-			     my @ulsstats=stat($ulsfn);
-                             $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
-                          }
-		       } else {
+                           if(-d $ulsdir) {
+                               if (opendir(LSDIR,$ulsdir)) {
+                                   while ($ulsfn=readdir(LSDIR)) {
+                                       my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+                                       $ulsout.=$ulsfn.'&'.
+                                                join('&',@ulsstats).':';
+                                   }
+                                   closedir(LSDIR);
+                               }
+                           } else {
+                               my @ulsstats=stat($ulsdir);
+                               $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+                           }
+                       } else {
                           $ulsout='no_such_dir';
                        }
                        if ($ulsout eq '') { $ulsout='empty'; }
                        print $client "$ulsout\n";
+# ----------------------------------------------------------------- setannounce
+                   } elsif ($userinput =~ /^setannounce/) {
+		       my ($cmd,$announcement)=split(/:/,$userinput);
+		       chomp($announcement);
+		       $announcement=&unescape($announcement);
+                       if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
+						'/announcement.txt')) {
+			   print $store $announcement;
+                           close $store;
+			   print $client "ok\n";
+		       } else {
+			   print $client "error: ".($!+0)."\n";
+		       }
+# ------------------------------------------------------------------ Hanging up
+                   } elsif (($userinput =~ /^exit/) ||
+                            ($userinput =~ /^init/)) {
+                       &logthis(
+      "Client $clientip ($hostid{$clientip}) hanging up: $userinput");
+                       print $client "bye\n";
+                       $client->close();
+		       last;
 # ------------------------------------------------------------- unknown command
+		   } elsif ($userinput =~ /^sethost:/) {
+		       print $client &sethost($userinput)."\n";
+		   } elsif ($userinput =~/^version:/) {
+		       print $client &version($userinput)."\n";
                    } else {
                        # unknown command
                        print $client "unknown_cmd\n";
                    }
-# ------------------------------------------------------ client unknown, refuse
+# -------------------------------------------------------------------- complete
+		   alarm(0);
+                   &status('Listening to '.$hostid{$clientip});
 	       }
+# --------------------------------------------- client unknown or fishy, refuse
             } else {
 	        print $client "refused\n";
+                $client->close();
                 &logthis("<font color=blue>WARNING: "
                 ."Rejected client $clientip, closing connection</font>");
-            }              
-            &logthis("<font color=red>CRITICAL: "
-                    ."Disconnect from $clientip ($hostid{$clientip})</font>");
+            }
+	}             
+
 # =============================================================================
-        }
-    
-        # tidy up gracefully and finish
-    
+       
+	&logthis("<font color=red>CRITICAL: "
+		 ."Disconnect from $clientip ($hostid{$clientip})</font>");    
+
+
         # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into
         # process death.
         exit;
+    
+}
+
+
+#
+#   Checks to see if the input roleput request was to set
+# an author role.  If so, invokes the lchtmldir script to set
+# up a correct public_html 
+# Parameters:
+#    request   - The request sent to the rolesput subchunk.
+#                We're looking for  /domain/_au
+#    domain    - The domain in which the user is having roles doctored.
+#    user      - Name of the user for which the role is being put.
+#    authtype  - The authentication type associated with the user.
+#
+sub ManagePermissions
+{
+    my $request = shift;
+    my $domain  = shift;
+    my $user    = shift;
+    my $authtype= shift;
+
+    # See if the request is of the form /$domain/_au
+    &logthis("ruequest is $request");
+    if($request =~ /^(\/$domain\/_au)$/) { # It's an author rolesput...
+	my $execdir = $perlvar{'lonDaemons'};
+	my $userhome= "/home/$user" ;
+	&logthis("system $execdir/lchtmldir $userhome $user $authtype");
+	system("$execdir/lchtmldir $userhome $user $authtype");
+    }
+}
+#
+#   GetAuthType - Determines the authorization type of a user in a domain.
+
+#     Returns the authorization type or nouser if there is no such user.
+#
+sub GetAuthType 
+{
+    my $domain = shift;
+    my $user   = shift;
+
+    Debug("GetAuthType( $domain, $user ) \n");
+    my $proname    = &propath($domain, $user); 
+    my $passwdfile = "$proname/passwd";
+    if( -e $passwdfile ) {
+	my $pf = IO::File->new($passwdfile);
+	my $realpassword = <$pf>;
+	chomp($realpassword);
+	Debug("Password info = $realpassword\n");
+	my ($authtype, $contentpwd) = split(/:/, $realpassword);
+	Debug("Authtype = $authtype, content = $contentpwd\n");
+	my $availinfo = '';
+	if($authtype eq 'krb4' or $authtype eq 'krb5') {
+	    $availinfo = $contentpwd;
+	}
+
+	return "$authtype:$availinfo";
+    }
+    else {
+	Debug("Returning nouser");
+	return "nouser";
+    }
+}
+
+sub addline {
+    my ($fname,$hostid,$ip,$newline)=@_;
+    my $contents;
+    my $found=0;
+    my $expr='^'.$hostid.':'.$ip.':';
+    $expr =~ s/\./\\\./g;
+    my $sh;
+    if ($sh=IO::File->new("$fname.subscription")) {
+	while (my $subline=<$sh>) {
+	    if ($subline !~ /$expr/) {$contents.= $subline;} else {$found=1;}
+	}
+	$sh->close();
+    }
+    $sh=IO::File->new(">$fname.subscription");
+    if ($contents) { print $sh $contents; }
+    if ($newline) { print $sh $newline; }
+    $sh->close();
+    return $found;
+}
+
+sub getchat {
+    my ($cdom,$cname,$udom,$uname)=@_;
+    my %hash;
+    my $proname=&propath($cdom,$cname);
+    my @entries=();
+    if (tie(%hash,'GDBM_File',"$proname/nohist_chatroom.db",
+	    &GDBM_READER(),0640)) {
+	@entries=map { $_.':'.$hash{$_} } sort keys %hash;
+	untie %hash;
+    }
+    my @participants=();
+    my $cutoff=time-60;
+    if (tie(%hash,'GDBM_File',"$proname/nohist_inchatroom.db",
+	    &GDBM_WRCREAT(),0640)) {
+        $hash{$uname.':'.$udom}=time;
+        foreach (sort keys %hash) {
+	    if ($hash{$_}>$cutoff) {
+		$participants[$#participants+1]='active_participant:'.$_;
+            }
+        }
+        untie %hash;
+    }
+    return (@participants,@entries);
+}
+
+sub chatadd {
+    my ($cdom,$cname,$newchat)=@_;
+    my %hash;
+    my $proname=&propath($cdom,$cname);
+    my @entries=();
+    my $time=time;
+    if (tie(%hash,'GDBM_File',"$proname/nohist_chatroom.db",
+	    &GDBM_WRCREAT(),0640)) {
+	@entries=map { $_.':'.$hash{$_} } sort keys %hash;
+	my ($lastid)=($entries[$#entries]=~/^(\w+)\:/);
+	my ($thentime,$idnum)=split(/\_/,$lastid);
+	my $newid=$time.'_000000';
+	if ($thentime==$time) {
+	    $idnum=~s/^0+//;
+	    $idnum++;
+	    $idnum=substr('000000'.$idnum,-6,6);
+	    $newid=$time.'_'.$idnum;
+	}
+	$hash{$newid}=$newchat;
+	my $expired=$time-3600;
+	foreach (keys %hash) {
+	    my ($thistime)=($_=~/(\d+)\_/);
+	    if ($thistime<$expired) {
+		delete $hash{$_};
+	    }
+	}
+	untie %hash;
+    }
+    {
+	my $hfh;
+	if ($hfh=IO::File->new(">>$proname/chatroom.log")) { 
+	    print $hfh "$time:".&unescape($newchat)."\n";
+	}
+    }
+}
+
+sub unsub {
+    my ($fname,$clientip)=@_;
+    my $result;
+    if (unlink("$fname.$hostid{$clientip}")) {
+	$result="ok\n";
+    } else {
+	$result="not_subscribed\n";
+    }
+    if (-e "$fname.subscription") {
+	my $found=&addline($fname,$hostid{$clientip},$clientip,'');
+	if ($found) { $result="ok\n"; }
+    } else {
+	if ($result != "ok\n") { $result="not_subscribed\n"; }
+    }
+    return $result;
+}
+
+sub currentversion {
+    my $fname=shift;
+    my $version=-1;
+    my $ulsdir='';
+    if ($fname=~/^(.+)\/[^\/]+$/) {
+       $ulsdir=$1;
+    }
+    my ($fnamere1,$fnamere2);
+    # remove version if already specified
+    $fname=~s/\.\d+\.(\w+(?:\.meta)*)$/\.$1/;
+    # get the bits that go before and after the version number
+    if ( $fname=~/^(.*\.)(\w+(?:\.meta)*)$/ ) {
+	$fnamere1=$1;
+	$fnamere2='.'.$2;
+    }
+    if (-e $fname) { $version=1; }
+    if (-e $ulsdir) {
+	if(-d $ulsdir) {
+	    if (opendir(LSDIR,$ulsdir)) {
+		my $ulsfn;
+		while ($ulsfn=readdir(LSDIR)) {
+# see if this is a regular file (ignore links produced earlier)
+		    my $thisfile=$ulsdir.'/'.$ulsfn;
+		    unless (-l $thisfile) {
+			if ($thisfile=~/\Q$fnamere1\E(\d+)\Q$fnamere2\E/) {
+			    if ($1>$version) { $version=$1; }
+			}
+		    }
+		}
+		closedir(LSDIR);
+		$version++;
+	    }
+	}
+    }
+    return $version;
+}
+
+sub thisversion {
+    my $fname=shift;
+    my $version=-1;
+    if ($fname=~/\.(\d+)\.\w+(?:\.meta)*$/) {
+	$version=$1;
+    }
+    return $version;
+}
+
+sub subscribe {
+    my ($userinput,$clientip)=@_;
+    my $result;
+    my ($cmd,$fname)=split(/:/,$userinput);
+    my $ownership=&ishome($fname);
+    if ($ownership eq 'owner') {
+# explitly asking for the current version?
+        unless (-e $fname) {
+            my $currentversion=&currentversion($fname);
+	    if (&thisversion($fname)==$currentversion) {
+                if ($fname=~/^(.+)\.\d+\.(\w+(?:\.meta)*)$/) {
+		    my $root=$1;
+                    my $extension=$2;
+                    symlink($root.'.'.$extension,
+                            $root.'.'.$currentversion.'.'.$extension);
+                    unless ($extension=~/\.meta$/) {
+                       symlink($root.'.'.$extension.'.meta',
+                            $root.'.'.$currentversion.'.'.$extension.'.meta');
+		    }
+                }
+            }
+        }
+	if (-e $fname) {
+	    if (-d $fname) {
+		$result="directory\n";
+	    } else {
+		if (-e "$fname.$hostid{$clientip}") {&unsub($fname,$clientip);}
+		my $now=time;
+		my $found=&addline($fname,$hostid{$clientip},$clientip,
+				   "$hostid{$clientip}:$clientip:$now\n");
+		if ($found) { $result="$fname\n"; }
+		# if they were subscribed to only meta data, delete that
+                # subscription, when you subscribe to a file you also get
+                # the metadata
+		unless ($fname=~/\.meta$/) { &unsub("$fname.meta",$clientip); }
+		$fname=~s/\/home\/httpd\/html\/res/raw/;
+		$fname="http://$thisserver/".$fname;
+		$result="$fname\n";
+	    }
+	} else {
+	    $result="not_found\n";
+	}
+    } else {
+	$result="rejected\n";
+    }
+    return $result;
+}
+
+sub make_passwd_file {
+    my ($uname, $umode,$npass,$passfilename)=@_;
+    my $result="ok\n";
+    if ($umode eq 'krb4' or $umode eq 'krb5') {
+	{
+	    my $pf = IO::File->new(">$passfilename");
+	    print $pf "$umode:$npass\n";
+	}
+    } elsif ($umode eq 'internal') {
+	my $salt=time;
+	$salt=substr($salt,6,2);
+	my $ncpass=crypt($npass,$salt);
+	{
+	    &Debug("Creating internal auth");
+	    my $pf = IO::File->new(">$passfilename");
+	    print $pf "internal:$ncpass\n"; 
+	}
+    } elsif ($umode eq 'localauth') {
+	{
+	    my $pf = IO::File->new(">$passfilename");
+	    print $pf "localauth:$npass\n";
+	}
+    } elsif ($umode eq 'unix') {
+	{
+	    my $execpath="$perlvar{'lonDaemons'}/"."lcuseradd";
+	    {
+		&Debug("Executing external: ".$execpath);
+		&Debug("user  = ".$uname.", Password =". $npass);
+		my $se = IO::File->new("|$execpath > $perlvar{'lonDaemons'}/logs/lcuseradd.log");
+		print $se "$uname\n";
+		print $se "$npass\n";
+		print $se "$npass\n";
+	    }
+	    my $useraddok = $?;
+	    if($useraddok > 0) {
+		&logthis("Failed lcuseradd: ".&lcuseraddstrerror($useraddok));
+	    }
+	    my $pf = IO::File->new(">$passfilename");
+	    print $pf "unix:\n";
+	}
+    } elsif ($umode eq 'none') {
+	{
+	    my $pf = IO::File->new(">$passfilename");
+	    print $pf "none:\n";
+	}
+    } else {
+	$result="auth_mode_error\n";
+    }
+    return $result;
+}
+
+sub sethost {
+    my ($remotereq) = @_;
+    my (undef,$hostid)=split(/:/,$remotereq);
+    if (!defined($hostid)) { $hostid=$perlvar{'lonHostID'}; }
+    if ($hostip{$perlvar{'lonHostID'}} eq $hostip{$hostid}) {
+	$currenthostid=$hostid;
+	$currentdomainid=$hostdom{$hostid};
+	&logthis("Setting hostid to $hostid, and domain to $currentdomainid");
+    } else {
+	&logthis("Requested host id $hostid not an alias of ".
+		 $perlvar{'lonHostID'}." refusing connection");
+	return 'unable_to_set';
+    }
+    return 'ok';
+}
+
+sub version {
+    my ($userinput)=@_;
+    $remoteVERSION=(split(/:/,$userinput))[1];
+    return "version:$VERSION";
+}
+
+#There is a copy of this in lonnet.pm
+sub userload {
+    my $numusers=0;
+    {
+	opendir(LONIDS,$perlvar{'lonIDsDir'});
+	my $filename;
+	my $curtime=time;
+	while ($filename=readdir(LONIDS)) {
+	    if ($filename eq '.' || $filename eq '..') {next;}
+	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
+	    if ($curtime-$mtime < 3600) { $numusers++; }
+	}
+	closedir(LONIDS);
+    }
+    my $userloadpercent=0;
+    my $maxuserload=$perlvar{'lonUserLoadLim'};
+    if ($maxuserload) {
+	$userloadpercent=100*$numusers/$maxuserload;
     }
+    $userloadpercent=sprintf("%.2f",$userloadpercent);
+    return $userloadpercent;
 }
 
+# ----------------------------------- POD (plain old documentation, CPAN style)
+
+=head1 NAME
+
+lond - "LON Daemon" Server (port "LOND" 5663)
+
+=head1 SYNOPSIS
+
+Usage: B<lond>
+
+Should only be run as user=www.  This is a command-line script which
+is invoked by B<loncron>.  There is no expectation that a typical user
+will manually start B<lond> from the command-line.  (In other words,
+DO NOT START B<lond> YOURSELF.)
+
+=head1 DESCRIPTION
+
+There are two characteristics associated with the running of B<lond>,
+PROCESS MANAGEMENT (starting, stopping, handling child processes)
+and SERVER-SIDE ACTIVITIES (password authentication, user creation,
+subscriptions, etc).  These are described in two large
+sections below.
+
+B<PROCESS MANAGEMENT>
+
+Preforker - server who forks first. Runs as a daemon. HUPs.
+Uses IDEA encryption
+
+B<lond> forks off children processes that correspond to the other servers
+in the network.  Management of these processes can be done at the
+parent process level or the child process level.
+
+B<logs/lond.log> is the location of log messages.
+
+The process management is now explained in terms of linux shell commands,
+subroutines internal to this code, and signal assignments:
+
+=over 4
+
+=item *
+
+PID is stored in B<logs/lond.pid>
+
+This is the process id number of the parent B<lond> process.
+
+=item *
+
+SIGTERM and SIGINT
+
+Parent signal assignment:
+ $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;
+
+Child signal assignment:
+ $SIG{INT}  = 'DEFAULT'; (and SIGTERM is DEFAULT also)
+(The child dies and a SIGALRM is sent to parent, awaking parent from slumber
+ to restart a new child.)
+
+Command-line invocations:
+ B<kill> B<-s> SIGTERM I<PID>
+ B<kill> B<-s> SIGINT I<PID>
+
+Subroutine B<HUNTSMAN>:
+ This is only invoked for the B<lond> parent I<PID>.
+This kills all the children, and then the parent.
+The B<lonc.pid> file is cleared.
+
+=item *
+
+SIGHUP
+
+Current bug:
+ This signal can only be processed the first time
+on the parent process.  Subsequent SIGHUP signals
+have no effect.
+
+Parent signal assignment:
+ $SIG{HUP}  = \&HUPSMAN;
+
+Child signal assignment:
+ none (nothing happens)
+
+Command-line invocations:
+ B<kill> B<-s> SIGHUP I<PID>
+
+Subroutine B<HUPSMAN>:
+ This is only invoked for the B<lond> parent I<PID>,
+This kills all the children, and then the parent.
+The B<lond.pid> file is cleared.
+
+=item *
+
+SIGUSR1
+
+Parent signal assignment:
+ $SIG{USR1} = \&USRMAN;
+
+Child signal assignment:
+ $SIG{USR1}= \&logstatus;
+
+Command-line invocations:
+ B<kill> B<-s> SIGUSR1 I<PID>
+
+Subroutine B<USRMAN>:
+ When invoked for the B<lond> parent I<PID>,
+SIGUSR1 is sent to all the children, and the status of
+each connection is logged.
+
+=item *
+
+SIGUSR2
+
+Parent Signal assignment:
+    $SIG{USR2} = \&UpdateHosts
+
+Child signal assignment:
+    NONE
+
+
+=item *
+
+SIGCHLD
+
+Parent signal assignment:
+ $SIG{CHLD} = \&REAPER;
+
+Child signal assignment:
+ none
+
+Command-line invocations:
+ B<kill> B<-s> SIGCHLD I<PID>
+
+Subroutine B<REAPER>:
+ This is only invoked for the B<lond> parent I<PID>.
+Information pertaining to the child is removed.
+The socket port is cleaned up.
+
+=back
+
+B<SERVER-SIDE ACTIVITIES>
+
+Server-side information can be accepted in an encrypted or non-encrypted
+method.
+
+=over 4
+
+=item ping
+
+Query a client in the hosts.tab table; "Are you there?"
+
+=item pong
+
+Respond to a ping query.
+
+=item ekey
+
+Read in encrypted key, make cipher.  Respond with a buildkey.
+
+=item load
+
+Respond with CPU load based on a computation upon /proc/loadavg.
+
+=item currentauth
+
+Reply with current authentication information (only over an
+encrypted channel).
+
+=item auth
+
+Only over an encrypted channel, reply as to whether a user's
+authentication information can be validated.
+
+=item passwd
+
+Allow for a password to be set.
+
+=item makeuser
+
+Make a user.
+
+=item passwd
+
+Allow for authentication mechanism and password to be changed.
+
+=item home
+
+Respond to a question "are you the home for a given user?"
+
+=item update
+
+Update contents of a subscribed resource.
+
+=item unsubscribe
+
+The server is unsubscribing from a resource.
+
+=item subscribe
+
+The server is subscribing to a resource.
+
+=item log
+
+Place in B<logs/lond.log>
+
+=item put
+
+stores hash in namespace
+
+=item rolesput
+
+put a role into a user's environment
+
+=item get
+
+returns hash with keys from array
+reference filled in from namespace
+
+=item eget
+
+returns hash with keys from array
+reference filled in from namesp (encrypts the return communication)
+
+=item rolesget
+
+get a role from a user's environment
+
+=item del
+
+deletes keys out of array from namespace
+
+=item keys
+
+returns namespace keys
+
+=item dump
+
+dumps the complete (or key matching regexp) namespace into a hash
+
+=item store
+
+stores hash permanently
+for this url; hashref needs to be given and should be a \%hashname; the
+remaining args aren't required and if they aren't passed or are '' they will
+be derived from the ENV
+
+=item restore
+
+returns a hash for a given url
+
+=item querysend
+
+Tells client about the lonsql process that has been launched in response
+to a sent query.
+
+=item queryreply
+
+Accept information from lonsql and make appropriate storage in temporary
+file space.
+
+=item idput
+
+Defines usernames as corresponding to IDs.  (These "IDs" are unique identifiers
+for each student, defined perhaps by the institutional Registrar.)
+
+=item idget
+
+Returns usernames corresponding to IDs.  (These "IDs" are unique identifiers
+for each student, defined perhaps by the institutional Registrar.)
+
+=item tmpput
+
+Accept and store information in temporary space.
+
+=item tmpget
+
+Send along temporarily stored information.
+
+=item ls
+
+List part of a user's directory.
+
+=item pushtable
+
+Pushes a file in /home/httpd/lonTab directory.  Currently limited to:
+hosts.tab and domain.tab. The old file is copied to  *.tab.backup but
+must be restored manually in case of a problem with the new table file.
+pushtable requires that the request be encrypted and validated via
+ValidateManager.  The form of the command is:
+enc:pushtable tablename <tablecontents> \n
+where pushtable, tablename and <tablecontents> will be encrypted, but \n is a 
+cleartext newline.
+
+=item Hanging up (exit or init)
+
+What to do when a client tells the server that they (the client)
+are leaving the network.
+
+=item unknown command
+
+If B<lond> is sent an unknown command (not in the list above),
+it replys to the client "unknown_cmd".
+
+
+=item UNKNOWN CLIENT
+
+If the anti-spoofing algorithm cannot verify the client,
+the client is rejected (with a "refused" message sent
+to the client, and the connection is closed.
+
+=back
+
+=head1 PREREQUISITES
+
+IO::Socket
+IO::File
+Apache::File
+Symbol
+POSIX
+Crypt::IDEA
+LWP::UserAgent()
+GDBM_File
+Authen::Krb4
+Authen::Krb5
+
+=head1 COREQUISITES
+
+=head1 OSNAMES
 
+linux
 
+=head1 SCRIPT CATEGORIES
 
+Server/Process
 
+=cut