--- loncom/lond	2003/09/09 20:47:46	1.142
+++ loncom/lond	2004/08/16 11:44:10	1.230
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.142 2003/09/09 20:47:46 www Exp $
+# $Id: lond,v 1.230 2004/08/16 11:44:10 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -10,7 +10,7 @@
 #
 # 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
+# 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,
@@ -24,52 +24,10 @@
 #
 # /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/29,06/30,07/14,07/15,07/17,07/20,07/25,09/18 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.142  2003/09/09 20:47:46  www
-# Permanently store chatroom entries in chatroom.log
-#
-# 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/';
@@ -87,29 +45,69 @@ use Authen::Krb4;
 use Authen::Krb5;
 use lib '/home/httpd/lib/perl/';
 use localauth;
+use localenroll;
+use File::Copy;
+use LONCAPA::ConfigFileEdit;
+use LONCAPA::lonlocal;
+use LONCAPA::lonssl;
+use Fcntl qw(:flock);
 
 my $DEBUG = 0;		       # Non zero to enable debug log entries.
 
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.142 $'; #' stupid emacs
+my $VERSION='$Revision: 1.230 $'; #' stupid emacs
 my $remoteVERSION;
-my $currenthostid;
+my $currenthostid="default";
 my $currentdomainid;
 
 my $client;
-my $clientip;
+my $clientip;			# IP address of client.
+my $clientdns;			# DNS name of client.
+my $clientname;			# LonCAPA name of client.
 
 my $server;
-my $thisserver;
+my $thisserver;			# DNS of us.
+
+my $keymode;
+
+my $cipher;			# Cipher key negotiated with client
+my $tmpsnum = 0;		# Id of tmpputs.
+
+# 
+#   Connection type is:
+#      client                   - All client actions are allowed
+#      manager                  - only management functions allowed.
+#      both                     - Both management and client actions are allowed
+#
+
+my $ConnectionType;
+
+my %hostid;			# ID's for hosts in cluster by ip.
+my %hostdom;			# LonCAPA domain for hosts in cluster.
+my %hostip;			# IPs for hosts in cluster.
+my %hostdns;			# ID's of hosts looked up by DNS name.
+
+my %managers;			# Ip -> manager names
 
-my %hostid;
-my %hostdom;
-my %hostip;
 my %perlvar;			# Will have the apache conf defined perl vars.
 
 #
+#   The hash below is used for command dispatching, and is therefore keyed on the request keyword.
+#    Each element of the hash contains a reference to an array that contains:
+#          A reference to a sub that executes the request corresponding to the keyword.
+#          A flag that is true if the request must be encoded to be acceptable.
+#          A mask with bits as follows:
+#                      CLIENT_OK    - Set when the function is allowed by ordinary clients
+#                      MANAGER_OK   - Set when the function is allowed to manager clients.
+#
+my $CLIENT_OK  = 1;
+my $MANAGER_OK = 2;
+my %Dispatcher;
+
+
+#
 #  The array below are password error strings."
 #
 my $lastpwderror    = 13;		# Largest error number from lcpasswd.
@@ -124,8 +122,10 @@ my @passwderrors = ("ok",
 		   "lcpasswd Cannot set new passwd.",
 		   "lcpasswd Username has invalid characters",
 		   "lcpasswd Invalid characters in password",
-		    "11", "12",
-		    "lcpasswd Password mismatch");
+		   "lcpasswd User already exists", 
+                   "lcpasswd Something went wrong with user addition.",
+		    "lcpasswd Password mismatch",
+		    "lcpasswd Error filename is invalid");
 
 
 #  The array below are lcuseradd error strings.:
@@ -137,16 +137,201 @@ my @adderrors    = ("ok",
 		    "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 make www member of users's group",
 		    "lcuseradd Unable to su to root",
 		    "lcuseradd Unable to set password",
-		    "lcuseradd Usrname has invbalid charcters",
+		    "lcuseradd Usrname has invalid characters",
 		    "lcuseradd Password has an invalid character",
 		    "lcuseradd User already exists",
 		    "lcuseradd Could not add user.",
 		    "lcuseradd Password mismatch");
 
 
+
+#
+#   Statistics that are maintained and dislayed in the status line.
+#
+my $Transactions = 0;		# Number of attempted transactions.
+my $Failures     = 0;		# Number of transcations failed.
+
+#   ResetStatistics: 
+#      Resets the statistics counters:
+#
+sub ResetStatistics {
+    $Transactions = 0;
+    $Failures     = 0;
+}
+
+#------------------------------------------------------------------------
+#
+#   LocalConnection
+#     Completes the formation of a locally authenticated connection.
+#     This function will ensure that the 'remote' client is really the
+#     local host.  If not, the connection is closed, and the function fails.
+#     If so, initcmd is parsed for the name of a file containing the
+#     IDEA session key.  The fie is opened, read, deleted and the session
+#     key returned to the caller.
+#
+# Parameters:
+#   $Socket      - Socket open on client.
+#   $initcmd     - The full text of the init command.
+#
+# Implicit inputs:
+#    $clientdns  - The DNS name of the remote client.
+#    $thisserver - Our DNS name.
+#
+# Returns:
+#     IDEA session key on success.
+#     undef on failure.
+#
+sub LocalConnection {
+    my ($Socket, $initcmd) = @_;
+    Debug("Attempting local connection: $initcmd client: $clientdns me: $thisserver");
+    if($clientdns ne $thisserver) {
+	&logthis('<font color="red"> LocalConnection rejecting non local: '
+		 ."$clientdns ne $thisserver </font>");
+	close $Socket;
+	return undef;
+    }  else {
+	chomp($initcmd);	# Get rid of \n in filename.
+	my ($init, $type, $name) = split(/:/, $initcmd);
+	Debug(" Init command: $init $type $name ");
+
+	# Require that $init = init, and $type = local:  Otherwise
+	# the caller is insane:
+
+	if(($init ne "init") && ($type ne "local")) {
+	    &logthis('<font color = "red"> LocalConnection: caller is insane! '
+		     ."init = $init, and type = $type </font>");
+	    close($Socket);;
+	    return undef;
+		
+	}
+	#  Now get the key filename:
+
+	my $IDEAKey = lonlocal::ReadKeyFile($name);
+	return $IDEAKey;
+    }
+}
+#------------------------------------------------------------------------------
+#
+#  SSLConnection
+#   Completes the formation of an ssh authenticated connection. The
+#   socket is promoted to an ssl socket.  If this promotion and the associated
+#   certificate exchange are successful, the IDEA key is generated and sent
+#   to the remote peer via the SSL tunnel. The IDEA key is also returned to
+#   the caller after the SSL tunnel is torn down.
+#
+# Parameters:
+#   Name              Type             Purpose
+#   $Socket          IO::Socket::INET  Plaintext socket.
+#
+# Returns:
+#    IDEA key on success.
+#    undef on failure.
+#
+sub SSLConnection {
+    my $Socket   = shift;
+
+    Debug("SSLConnection: ");
+    my $KeyFile         = lonssl::KeyFile();
+    if(!$KeyFile) {
+	my $err = lonssl::LastError();
+	&logthis("<font color=\"red\"> CRITICAL"
+		 ."Can't get key file $err </font>");
+	return undef;
+    }
+    my ($CACertificate,
+	$Certificate) = lonssl::CertificateFile();
+
+
+    # If any of the key, certificate or certificate authority 
+    # certificate filenames are not defined, this can't work.
+
+    if((!$Certificate) || (!$CACertificate)) {
+	my $err = lonssl::LastError();
+	&logthis("<font color=\"red\"> CRITICAL"
+		 ."Can't get certificates: $err </font>");
+
+	return undef;
+    }
+    Debug("Key: $KeyFile CA: $CACertificate Cert: $Certificate");
+
+    # Indicate to our peer that we can procede with
+    # a transition to ssl authentication:
+
+    print $Socket "ok:ssl\n";
+
+    Debug("Approving promotion -> ssl");
+    #  And do so:
+
+    my $SSLSocket = lonssl::PromoteServerSocket($Socket,
+						$CACertificate,
+						$Certificate,
+						$KeyFile);
+    if(! ($SSLSocket) ) {	# SSL socket promotion failed.
+	my $err = lonssl::LastError();
+	&logthis("<font color=\"red\"> CRITICAL "
+		 ."SSL Socket promotion failed: $err </font>");
+	return undef;
+    }
+    Debug("SSL Promotion successful");
+
+    # 
+    #  The only thing we'll use the socket for is to send the IDEA key
+    #  to the peer:
+
+    my $Key = lonlocal::CreateCipherKey();
+    print $SSLSocket "$Key\n";
+
+    lonssl::Close($SSLSocket); 
+
+    Debug("Key exchange complete: $Key");
+
+    return $Key;
+}
+#
+#     InsecureConnection: 
+#        If insecure connections are allowd,
+#        exchange a challenge with the client to 'validate' the
+#        client (not really, but that's the protocol):
+#        We produce a challenge string that's sent to the client.
+#        The client must then echo the challenge verbatim to us.
+#
+#  Parameter:
+#      Socket      - Socket open on the client.
+#  Returns:
+#      1           - success.
+#      0           - failure (e.g.mismatch or insecure not allowed).
+#
+sub InsecureConnection {
+    my $Socket  =  shift;
+
+    #   Don't even start if insecure connections are not allowed.
+
+    if(! $perlvar{londAllowInsecure}) {	# Insecure connections not allowed.
+	return 0;
+    }
+
+    #   Fabricate a challenge string and send it..
+
+    my $challenge = "$$".time;	# pid + time.
+    print $Socket "$challenge\n";
+    &status("Waiting for challenge reply");
+
+    my $answer = <$Socket>;
+    $answer    =~s/\W//g;
+    if($challenge eq $answer) {
+	return 1;
+    } else {
+	logthis("<font color='blue'>WARNING client did not respond to challenge</font>");
+	&status("No challenge reqply");
+	return 0;
+    }
+    
+
+}
+
 #
 #   GetCertificate: Given a transaction that requires a certificate,
 #   this function will extract the certificate from the transaction
@@ -164,6 +349,67 @@ sub GetCertificate {
     return $clientip;
 }
 
+#
+#   Return true if client is a manager.
+#
+sub isManager {
+    return (($ConnectionType eq "manager") || ($ConnectionType eq "both"));
+}
+#
+#   Return tru if client can do client functions
+#
+sub isClient {
+    return (($ConnectionType eq "client") || ($ConnectionType eq "both"));
+}
+
+
+#
+#   ReadManagerTable: Reads in the current manager table. For now this is
+#                     done on each manager authentication because:
+#                     - These authentications are not frequent
+#                     - This allows dynamic changes to the manager table
+#                       without the need to signal to the lond.
+#
+sub ReadManagerTable {
+
+    #   Clean out the old table first..
+
+   foreach my $key (keys %managers) {
+      delete $managers{$key};
+   }
+
+   my $tablename = $perlvar{'lonTabDir'}."/managers.tab";
+   if (!open (MANAGERS, $tablename)) {
+      logthis('<font color="red">No manager table.  Nobody can manage!!</font>');
+      return;
+   }
+   while(my $host = <MANAGERS>) {
+      chomp($host);
+      if ($host =~ "^#") {                  # Comment line.
+         next;
+      }
+      if (!defined $hostip{$host}) { # This is a non cluster member
+	    #  The entry is of the form:
+	    #    cluname:hostname
+	    #  cluname - A 'cluster hostname' is needed in order to negotiate
+	    #            the host key.
+	    #  hostname- The dns name of the host.
+	    #
+          my($cluname, $dnsname) = split(/:/, $host);
+          
+          my $ip = gethostbyname($dnsname);
+          if(defined($ip)) {                 # bad names don't deserve entry.
+            my $hostip = inet_ntoa($ip);
+            $managers{$hostip} = $cluname;
+            logthis('<font color="green"> registering manager '.
+                    "$dnsname as $cluname with $hostip </font>\n");
+         }
+      } else {
+         logthis('<font color="green"> existing host'." $host</font>\n");
+         $managers{$hostip{$host}} = $host;  # Use info from cluster tab if clumemeber
+      }
+   }
+}
 
 #
 #  ValidManager: Determines if a given certificate represents a valid manager.
@@ -175,17 +421,173 @@ sub GetCertificate {
 sub ValidManager {
     my $certificate = shift; 
 
-    my $hostentry   = $hostid{$certificate};
-    if ($hostentry ne undef) {
-	&logthis('<font color="yellow">Authenticating manager'.
-		 " $hostentry</font>");
+    return isManager;
+}
+#
+#  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, $newfile) = @_;
+
+    #  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 {
-	&logthis('<font color="red"> Failed manager authentication '.
-		 "$certificate </font>");
+	return 0;
     }
 }
 #
+#  Host files are passed out with externally visible host IPs.
+#  If, for example, we are behind a fire-wall or NAT host, our 
+#  internally visible IP may be different than the externally
+#  visible IP.  Therefore, we always adjust the contents of the
+#  host file so that the entry for ME is the IP that we believe
+#  we have.  At present, this is defined as the entry that
+#  DNS has for us.  If by some chance we are not able to get a
+#  DNS translation for us, then we assume that the host.tab file
+#  is correct.  
+#    BUGBUGBUG - in the future, we really should see if we can
+#       easily query the interface(s) instead.
+# Parameter(s):
+#     contents    - The contents of the host.tab to check.
+# Returns:
+#     newcontents - The adjusted contents.
+#
+#
+sub AdjustHostContents {
+    my $contents  = shift;
+    my $adjusted;
+    my $me        = $perlvar{'lonHostID'};
+
+ foreach my $line (split(/\n/,$contents)) {
+	if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/))) {
+	    chomp($line);
+	    my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon)=split(/:/,$line);
+	    if ($id eq $me) {
+          my $ip = gethostbyname($name);
+          my $ipnew = inet_ntoa($ip);
+         $ip = $ipnew;
+		#  Reconstruct the host line and append to adjusted:
+		
+		   my $newline = "$id:$domain:$role:$name:$ip";
+		   if($maxcon ne "") { # Not all hosts have loncnew tuning params
+		     $newline .= ":$maxcon:$idleto:$mincon";
+		   }
+		   $adjusted .= $newline."\n";
+		
+      } else {		# Not me, pass unmodified.
+		   $adjusted .= $line."\n";
+      }
+	} else {                  # Blank or comment never re-written.
+	    $adjusted .= $line."\n";	# Pass blanks and comments as is.
+	}
+ }
+ return $adjusted;
+}
+#
+#   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, $Contents) = @_;
+    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;
+}
+
+
+#
+#   ConfigFileFromSelector: converts a configuration file selector
+#                 (one of host or domain at this point) into a 
+#                 configuration file pathname.
+#
+#  Parameters:
+#      selector  - Configuration file selector.
+#  Returns:
+#      Full path to the file or undef if the selector is invalid.
+#
+sub ConfigFileFromSelector {
+    my $selector   = shift;
+    my $tablefile;
+
+    my $tabledir = $perlvar{'lonTabDir'}.'/';
+    if ($selector eq "hosts") {
+	$tablefile = $tabledir."hosts.tab";
+    } elsif ($selector eq "domain") {
+	$tablefile = $tabledir."domain.tab";
+    } else {
+	return undef;
+    }
+    return $tablefile;
+
+}
+#
 #   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>
@@ -214,12 +616,9 @@ sub PushFile {
     # 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 {
+
+    my $tablefile = ConfigFileFromSelector($filename);
+    if(! (defined $tablefile)) {
 	return "refused";
     }
     #
@@ -229,19 +628,2595 @@ sub PushFile {
     #
     my $backupfile = $tablefile;
     $backupfile    =~ s/\.tab$/.old/;
-    # CopyFile($tablefile, $backupfile);
+    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>");
     
+    #  If the file being pushed is the host file, we adjust the entry for ourself so that the
+    #  IP will be our current IP as looked up in dns.  Note this is only 99% good as it's possible
+    #  to conceive of conditions where we don't have a DNS entry locally.  This is possible in a 
+    #  network sense but it doesn't make much sense in a LonCAPA sense so we ignore (for now)
+    #  that possibilty.
+
+    if($filename eq "host") {
+	$contents = AdjustHostContents($contents);
+    }
+
     #  Install the new file:
 
-    # InstallFile($tablefile, $contents);
+    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;
+
+
+    # separate the request (reinit) from the process identifier and
+    # validate it producing the name of the .pid file for the process.
+    #
+    #
+    my ($junk, $process) = split(":", $request);
+    my $processpidfile = $perlvar{'lonDaemons'}.'/logs/';
+    if($process eq 'lonc') {
+	$processpidfile = $processpidfile."lonc.pid";
+	if (!open(PIDFILE, "< $processpidfile")) {
+	    return "error:Open failed for $processpidfile";
+	}
+	my $loncpid = <PIDFILE>;
+	close(PIDFILE);
+	logthis('<font color="red"> Reinitializing lonc pid='.$loncpid
+		."</font>");
+	kill("USR2", $loncpid);
+    } elsif ($process eq 'lond') {
+	logthis('<font color="red"> Reinitializing self (lond) </font>');
+	&UpdateHosts;			# Lond is us!!
+    } else {
+	&logthis('<font color="yellow" Invalid reinit request for '.$process
+		 ."</font>");
+	return "error:Invalid process identifier $process";
+    }
+    return 'ok';
+}
+#   Validate a line in a configuration file edit script:
+#   Validation includes:
+#     - Ensuring the command is valid.
+#     - Ensuring the command has sufficient parameters
+#   Parameters:
+#     scriptline - A line to validate (\n has been stripped for what it's worth).
+#
+#   Return:
+#      0     - Invalid scriptline.
+#      1     - Valid scriptline
+#  NOTE:
+#     Only the command syntax is checked, not the executability of the
+#     command.
+#
+sub isValidEditCommand {
+    my $scriptline = shift;
+
+    #   Line elements are pipe separated:
+
+    my ($command, $key, $newline)  = split(/\|/, $scriptline);
+    &logthis('<font color="green"> isValideditCommand checking: '.
+	     "Command = '$command', Key = '$key', Newline = '$newline' </font>\n");
+    
+    if ($command eq "delete") {
+	#
+	#   key with no newline.
+	#
+	if( ($key eq "") || ($newline ne "")) {
+	    return 0;		# Must have key but no newline.
+	} else {
+	    return 1;		# Valid syntax.
+	}
+    } elsif ($command eq "replace") {
+	#
+	#   key and newline:
+	#
+	if (($key eq "") || ($newline eq "")) {
+	    return 0;
+	} else {
+	    return 1;
+	}
+    } elsif ($command eq "append") {
+	if (($key ne "") && ($newline eq "")) {
+	    return 1;
+	} else {
+	    return 0;
+	}
+    } else {
+	return 0;		# Invalid command.
+    }
+    return 0;			# Should not get here!!!
+}
+#
+#   ApplyEdit - Applies an edit command to a line in a configuration 
+#               file.  It is the caller's responsiblity to validate the
+#               edit line.
+#   Parameters:
+#      $directive - A single edit directive to apply.  
+#                   Edit directives are of the form:
+#                  append|newline      - Appends a new line to the file.
+#                  replace|key|newline - Replaces the line with key value 'key'
+#                  delete|key          - Deletes the line with key value 'key'.
+#      $editor   - A config file editor object that contains the
+#                  file being edited.
+#
+sub ApplyEdit {
+
+    my ($directive, $editor) = @_;
+
+    # Break the directive down into its command and its parameters
+    # (at most two at this point.  The meaning of the parameters, if in fact
+    #  they exist depends on the command).
+
+    my ($command, $p1, $p2) = split(/\|/, $directive);
+
+    if($command eq "append") {
+	$editor->Append($p1);	          # p1 - key p2 null.
+    } elsif ($command eq "replace") {
+	$editor->ReplaceLine($p1, $p2);   # p1 - key p2 = newline.
+    } elsif ($command eq "delete") {
+	$editor->DeleteLine($p1);         # p1 - key p2 null.
+    } else {			          # Should not get here!!!
+	die "Invalid command given to ApplyEdit $command"
+    }
+}
+#
+# AdjustOurHost:
+#           Adjusts a host file stored in a configuration file editor object
+#           for the true IP address of this host. This is necessary for hosts
+#           that live behind a firewall.
+#           Those hosts have a publicly distributed IP of the firewall, but
+#           internally must use their actual IP.  We assume that a given
+#           host only has a single IP interface for now.
+# Formal Parameters:
+#     editor   - The configuration file editor to adjust.  This
+#                editor is assumed to contain a hosts.tab file.
+# Strategy:
+#    - Figure out our hostname.
+#    - Lookup the entry for this host.
+#    - Modify the line to contain our IP
+#    - Do a replace for this host.
+sub AdjustOurHost {
+    my $editor        = shift;
+
+    # figure out who I am.
+
+    my $myHostName    = $perlvar{'lonHostID'}; # LonCAPA hostname.
+
+    #  Get my host file entry.
+
+    my $ConfigLine    = $editor->Find($myHostName);
+    if(! (defined $ConfigLine)) {
+	die "AdjustOurHost - no entry for me in hosts file $myHostName";
+    }
+    # figure out my IP:
+    #   Use the config line to get my hostname.
+    #   Use gethostbyname to translate that into an IP address.
+    #
+    my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon) = split(/:/,$ConfigLine);
+    my $BinaryIp = gethostbyname($name);
+    my $ip       = inet_ntoa($ip);
+    #
+    #  Reassemble the config line from the elements in the list.
+    #  Note that if the loncnew items were not present before, they will
+    #  be now even if they would be empty
+    #
+    my $newConfigLine = $id;
+    foreach my $item ($domain, $role, $name, $ip, $maxcon, $idleto, $mincon) {
+	$newConfigLine .= ":".$item;
+    }
+    #  Replace the line:
+
+    $editor->ReplaceLine($id, $newConfigLine);
+    
+}
+#
+#   ReplaceConfigFile:
+#              Replaces a configuration file with the contents of a
+#              configuration file editor object.
+#              This is done by:
+#              - Copying the target file to <filename>.old
+#              - Writing the new file to <filename>.tmp
+#              - Moving <filename.tmp>  -> <filename>
+#              This laborious process ensures that the system is never without
+#              a configuration file that's at least valid (even if the contents
+#              may be dated).
+#   Parameters:
+#        filename   - Name of the file to modify... this is a full path.
+#        editor     - Editor containing the file.
+#
+sub ReplaceConfigFile {
+    
+    my ($filename, $editor) = @_;
+
+    CopyFile ($filename, $filename.".old");
+
+    my $contents  = $editor->Get(); # Get the contents of the file.
+
+    InstallFile($filename, $contents);
+}
+#   
+#
+#   Called to edit a configuration table  file
+#   Parameters:
+#      request           - The entire command/request sent by lonc or lonManage
+#   Return:
+#      The reply to send to the client.
+#
+sub EditFile {
+    my $request = shift;
+
+    #  Split the command into it's pieces:  edit:filetype:script
+
+    my ($request, $filetype, $script) = split(/:/, $request,3);	# : in script
+
+    #  Check the pre-coditions for success:
+
+    if($request != "edit") {	# Something is amiss afoot alack.
+	return "error:edit request detected, but request != 'edit'\n";
+    }
+    if( ($filetype ne "hosts")  &&
+	($filetype ne "domain")) {
+	return "error:edit requested with invalid file specifier: $filetype \n";
+    }
+
+    #   Split the edit script and check it's validity.
+
+    my @scriptlines = split(/\n/, $script);  # one line per element.
+    my $linecount   = scalar(@scriptlines);
+    for(my $i = 0; $i < $linecount; $i++) {
+	chomp($scriptlines[$i]);
+	if(!isValidEditCommand($scriptlines[$i])) {
+	    return "error:edit with bad script line: '$scriptlines[$i]' \n";
+	}
+    }
+
+    #   Execute the edit operation.
+    #   - Create a config file editor for the appropriate file and 
+    #   - execute each command in the script:
+    #
+    my $configfile = ConfigFileFromSelector($filetype);
+    if (!(defined $configfile)) {
+	return "refused\n";
+    }
+    my $editor = ConfigFileEdit->new($configfile);
+
+    for (my $i = 0; $i < $linecount; $i++) {
+	ApplyEdit($scriptlines[$i], $editor);
+    }
+    # If the file is the host file, ensure that our host is
+    # adjusted to have our ip:
+    #
+    if($filetype eq "host") {
+	AdjustOurHost($editor);
+    }
+    #  Finally replace the current file with our file.
+    #
+    ReplaceConfigFile($configfile, $editor);
+
+    return "ok\n";
+}
+
+#---------------------------------------------------------------
+#
+# Manipulation of hash based databases (factoring out common code
+# for later use as we refactor.
+#
+#  Ties a domain level resource file to a hash.
+#  If requested a history entry is created in the associated hist file.
+#
+#  Parameters:
+#     domain    - Name of the domain in which the resource file lives.
+#     namespace - Name of the hash within that domain.
+#     how       - How to tie the hash (e.g. GDBM_WRCREAT()).
+#     loghead   - Optional parameter, if present a log entry is created
+#                 in the associated history file and this is the first part
+#                  of that entry.
+#     logtail   - Goes along with loghead,  The actual logentry is of the
+#                 form $loghead:<timestamp>:logtail.
+# Returns:
+#    Reference to a hash bound to the db file or alternatively undef
+#    if the tie failed.
+#
+sub tie_domain_hash {
+    my ($domain,$namespace,$how,$loghead,$logtail) = @_;
+    
+    # Filter out any whitespace in the domain name:
+    
+    $domain =~ s/\W//g;
+    
+    # We have enough to go on to tie the hash:
+    
+    my $user_top_dir   = $perlvar{'lonUsersDir'};
+    my $domain_dir     = $user_top_dir."/$domain";
+    my $resource_file  = $domain_dir."/$namespace.db";
+    my %hash;
+    if(tie(%hash, 'GDBM_File', $resource_file, $how, 0640)) {
+	if (defined($loghead)) {	# Need to log the operation.
+	    my $logFh = IO::File->new(">>$domain_dir/$namespace.hist");
+	    if($logFh) {
+		my $timestamp = time;
+		print $logFh "$loghead:$timestamp:$logtail\n";
+	    }
+	    $logFh->close;
+	}
+	return \%hash;		# Return the tied hash.
+    } else {
+	return undef;		# Tie failed.
+    }
+}
+
+#
+#   Ties a user's resource file to a hash.  
+#   If necessary, an appropriate history
+#   log file entry is made as well.
+#   This sub factors out common code from the subs that manipulate
+#   the various gdbm files that keep keyword value pairs.
+# Parameters:
+#   domain       - Name of the domain the user is in.
+#   user         - Name of the 'current user'.
+#   namespace    - Namespace representing the file to tie.
+#   how          - What the tie is done to (e.g. GDBM_WRCREAT().
+#   loghead      - Optional first part of log entry if there may be a
+#                  history file.
+#   what         - Optional tail of log entry if there may be a history
+#                  file.
+# Returns:
+#   hash to which the database is tied.  It's up to the caller to untie.
+#   undef if the has could not be tied.
+#
+sub tie_user_hash {
+    my ($domain,$user,$namespace,$how,$loghead,$what) = @_;
+
+    $namespace=~s/\//\_/g;	# / -> _
+    $namespace=~s/\W//g;		# whitespace eliminated.
+    my $proname     = propath($domain, $user);
+   
+    #  Tie the database.
+    
+    my %hash;
+    if(tie(%hash, 'GDBM_File', "$proname/$namespace.db",
+	   $how, 0640)) {
+	# If this is a namespace for which a history is kept,
+	# make the history log entry:    
+	if (($namespace =~/^nohist\_/) && (defined($loghead))) {
+	    my $args = scalar @_;
+	    Debug(" Opening history: $namespace $args");
+	    my $hfh = IO::File->new(">>$proname/$namespace.hist"); 
+	    if($hfh) {
+		my $now = time;
+		print $hfh "$loghead:$now:$what\n";
+	    }
+	    $hfh->close;
+	}
+	return \%hash;
+    } else {
+	return undef;
+    }
+    
+}
+
+#--------------------- Request Handlers --------------------------------------------
+#
+#   By convention each request handler registers itself prior to the sub 
+#   declaration:
+#
+
+#++
+#
+#  Handles ping requests.
+#  Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host we are
+#                       known as.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Side effects:
+#      Reply information is sent to the client.
+
+sub ping_handler {
+    my ($cmd, $tail, $client) = @_;
+    Debug("$cmd $tail $client .. $currenthostid:");
+   
+    Reply( $client,"$currenthostid\n","$cmd:$tail");
+   
+    return 1;
+}
+&register_handler("ping", \&ping_handler, 0, 1, 1);       # Ping unencoded, client or manager.
+
+#++
+#
+# Handles pong requests.  Pong replies with our current host id, and
+#                         the results of a ping sent to us via our lonc.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host we are
+#                       connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Side effects:
+#      Reply information is sent to the client.
+
+sub pong_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+    my $reply=&reply("ping",$clientname);
+    &Reply( $replyfd, "$currenthostid:$reply\n", "$cmd:$tail"); 
+    return 1;
+}
+&register_handler("pong", \&pong_handler, 0, 1, 1);       # Pong unencoded, client or manager
+
+#++
+#      Called to establish an encrypted session key with the remote client.
+#      Note that with secure lond, in most cases this function is never
+#      invoked.  Instead, the secure session key is established either
+#      via a local file that's locked down tight and only lives for a short
+#      time, or via an ssl tunnel...and is generated from a bunch-o-random
+#      bits from /dev/urandom, rather than the predictable pattern used by
+#      by this sub.  This sub is only used in the old-style insecure
+#      key negotiation.
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host
+#                       known as.
+#      $clientname    - Global variable that carries the name of the hsot we're connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Implicit Outputs:
+#      Reply information is sent to the client.
+#      $cipher is set with a reference to a new IDEA encryption object.
+#
+sub establish_key_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+    my $buildkey=time.$$.int(rand 100000);
+    $buildkey=~tr/1-6/A-F/;
+    $buildkey=int(rand 100000).$buildkey.int(rand 100000);
+    my $key=$currenthostid.$clientname;
+    $key=~tr/a-z/A-Z/;
+    $key=~tr/G-P/0-9/;
+    $key=~tr/Q-Z/0-9/;
+    $key=$key.$buildkey.$key.$buildkey.$key.$buildkey;
+    $key=substr($key,0,32);
+    my $cipherkey=pack("H32",$key);
+    $cipher=new IDEA $cipherkey;
+    &Reply($replyfd, "$buildkey\n", "$cmd:$tail"); 
+   
+    return 1;
+
+}
+&register_handler("ekey", \&establish_key_handler, 0, 1,1);
+
+
+#     Handler for the load command.  Returns the current system load average
+#     to the requestor.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host
+#                       known as.
+#      $clientname    - Global variable that carries the name of the hsot we're connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Side effects:
+#      Reply information is sent to the client.
+sub load_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+   # Get the load average from /proc/loadavg and calculate it as a percentage of
+   # the allowed load limit as set by the perl global variable lonLoadLim
+
+    my $loadavg;
+    my $loadfile=IO::File->new('/proc/loadavg');
+   
+    $loadavg=<$loadfile>;
+    $loadavg =~ s/\s.*//g;                      # Extract the first field only.
+   
+    my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
+
+    &Reply( $replyfd, "$loadpercent\n", "$cmd:$tail");
+   
+    return 1;
+}
+register_handler("load", \&load_handler, 0, 1, 0);
+
+#
+#   Process the userload request.  This sub returns to the client the current
+#  user load average.  It can be invoked either by clients or managers.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host
+#                       known as.
+#      $clientname    - Global variable that carries the name of the hsot we're connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+# Implicit inputs:
+#     whatever the userload() function requires.
+#  Implicit outputs:
+#     the reply is written to the client.
+#
+sub user_load_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+    my $userloadpercent=&userload();
+    &Reply($replyfd, "$userloadpercent\n", "$cmd:$tail");
+    
+    return 1;
+}
+register_handler("userload", \&user_load_handler, 0, 1, 0);
+
+#   Process a request for the authorization type of a user:
+#   (userauth).
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+# Implicit outputs:
+#    The user authorization type is written to the client.
+#
+sub user_authorization_type {
+    my ($cmd, $tail, $replyfd) = @_;
+   
+    my $userinput = "$cmd:$tail";
+   
+    #  Pull the domain and username out of the command tail.
+    # and call get_auth_type to determine the authentication type.
+   
+    my ($udom,$uname)=split(/:/,$tail);
+    my $result = &get_auth_type($udom, $uname);
+    if($result eq "nouser") {
+	&Failure( $replyfd, "unknown_user\n", $userinput);
+    } else {
+	#
+	# We only want to pass the second field from get_auth_type
+	# for ^krb.. otherwise we'll be handing out the encrypted
+	# password for internals e.g.
+	#
+	my ($type,$otherinfo) = split(/:/,$result);
+	if($type =~ /^krb/) {
+	    $type = $result;
+	}
+	&Reply( $replyfd, "$type:\n", $userinput);
+    }
+  
+    return 1;
+}
+&register_handler("currentauth", \&user_authorization_type, 1, 1, 0);
+
+#   Process a request by a manager to push a hosts or domain table 
+#   to us.  We pick apart the command and pass it on to the subs
+#   that already exist to do this.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $client - File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+# Implicit Output:
+#    a reply is written to the client.
+
+sub push_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput = "$cmd:$tail";
+
+    # At this time we only know that the IP of our partner is a valid manager
+    # the code below is a hook to do further authentication (e.g. to resolve
+    # spoofing).
+
+    my $cert = &GetCertificate($userinput);
+    if(&ValidManager($cert)) { 
+
+	# Now presumably we have the bona fides of both the peer host and the
+	# process making the request.
+      
+	my $reply = &PushFile($userinput);
+	&Reply($client, "$reply\n", $userinput);
+
+    } else {
+	&Failure( $client, "refused\n", $userinput);
+    } 
+    return 1;
+}
+&register_handler("pushfile", \&push_file_handler, 1, 0, 1);
+
+
+
+#   Process a reinit request.  Reinit requests that either
+#   lonc or lond be reinitialized so that an updated 
+#   host.tab or domain.tab can be processed.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $client - File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+#  Implicit output:
+#     a reply is sent to the client.
+#
+sub reinit_process_handler {
+    my ($cmd, $tail, $client) = @_;
+   
+    my $userinput = "$cmd:$tail";
+   
+    my $cert = &GetCertificate($userinput);
+    if(&ValidManager($cert)) {
+	chomp($userinput);
+	my $reply = &ReinitProcess($userinput);
+	&Reply( $client,  "$reply\n", $userinput);
+    } else {
+	&Failure( $client, "refused\n", $userinput);
+    }
+    return 1;
+}
+
+&register_handler("reinit", \&reinit_process_handler, 1, 0, 1);
+
+#  Process the editing script for a table edit operation.
+#  the editing operation must be encrypted and requested by
+#  a manager host.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $client - File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+#  Implicit output:
+#     a reply is sent to the client.
+#
+sub edit_table_handler {
+    my ($command, $tail, $client) = @_;
+   
+    my $userinput = "$command:$tail";
+
+    my $cert = &GetCertificate($userinput);
+    if(&ValidManager($cert)) {
+	my($filetype, $script) = split(/:/, $tail);
+	if (($filetype eq "hosts") || 
+	    ($filetype eq "domain")) {
+	    if($script ne "") {
+		&Reply($client,              # BUGBUG - EditFile
+		      &EditFile($userinput), #   could fail.
+		      $userinput);
+	    } else {
+		&Failure($client,"refused\n",$userinput);
+	    }
+	} else {
+	    &Failure($client,"refused\n",$userinput);
+	}
+    } else {
+	&Failure($client,"refused\n",$userinput);
+    }
+    return 1;
+}
+register_handler("edit", \&edit_table_handler, 1, 0, 1);
+
+
+#
+#   Authenticate a user against the LonCAPA authentication
+#   database.  Note that there are several authentication
+#   possibilities:
+#   - unix     - The user can be authenticated against the unix
+#                password file.
+#   - internal - The user can be authenticated against a purely 
+#                internal per user password file.
+#   - kerberos - The user can be authenticated against either a kerb4 or kerb5
+#                ticket granting authority.
+#   - user     - The person tailoring LonCAPA can supply a user authentication
+#                mechanism that is per system.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+#
+sub authenticate_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    
+    #  Regenerate the full input line 
+    
+    my $userinput  = $cmd.":".$tail;
+    
+    #  udom    - User's domain.
+    #  uname   - Username.
+    #  upass   - User's password.
+    
+    my ($udom,$uname,$upass)=split(/:/,$tail);
+    &Debug(" Authenticate domain = $udom, user = $uname, password = $upass");
+    chomp($upass);
+    $upass=&unescape($upass);
+
+    my $pwdcorrect = &validate_user($udom, $uname, $upass);
+    if($pwdcorrect) {
+	&Reply( $client, "authorized\n", $userinput);
+	#
+	#  Bad credentials: Failed to authorize
+	#
+    } else {
+	&Failure( $client, "non_authorized\n", $userinput);
+    }
+
+    return 1;
+}
+
+register_handler("auth", \&authenticate_handler, 1, 1, 0);
+
+#
+#   Change a user's password.  Note that this function is complicated by
+#   the fact that a user may be authenticated in more than one way:
+#   At present, we are not able to change the password for all types of
+#   authentication methods.  Only for:
+#      unix    - unix password or shadow passoword style authentication.
+#      local   - Locally written authentication mechanism.
+#   For now, kerb4 and kerb5 password changes are not supported and result
+#   in an error.
+# FUTURE WORK:
+#    Support kerberos passwd changes?
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+sub change_password_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput = $cmd.":".$tail;           # Reconstruct client's string.
+
+    #
+    #  udom  - user's domain.
+    #  uname - Username.
+    #  upass - Current password.
+    #  npass - New password.
+   
+    my ($udom,$uname,$upass,$npass)=split(/:/,$tail);
+
+    $upass=&unescape($upass);
+    $npass=&unescape($npass);
+    &Debug("Trying to change password for $uname");
+
+    # First require that the user can be authenticated with their
+    # old password:
+
+    my $validated = &validate_user($udom, $uname, $upass);
+    if($validated) {
+	my $realpasswd  = &get_auth_type($udom, $uname); # Defined since authd.
+	
+	my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
+	if ($howpwd eq 'internal') {
+	    &Debug("internal auth");
+	    my $salt=time;
+	    $salt=substr($salt,6,2);
+	    my $ncpass=crypt($npass,$salt);
+	    if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
+		&logthis("Result of password change for "
+			 ."$uname: pwchange_success");
+		&Reply($client, "ok\n", $userinput);
+	    } else {
+		&logthis("Unable to open $uname passwd "               
+			 ."to change password");
+		&Failure( $client, "non_authorized\n",$userinput);
+	    }
+	} elsif ($howpwd eq 'unix') {
+	    # Unix means we have to access /etc/password
+	    &Debug("auth is unix");
+	    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($?));
+	    &Reply($client, "$result\n", $userinput);
+	} else {
+	    # this just means that the current password mode is not
+	    # one we know how to change (e.g the kerberos auth modes or
+	    # locally written auth handler).
+	    #
+	    &Failure( $client, "auth_mode_error\n", $userinput);
+	}  
+	
+    } else {
+	&Failure( $client, "non_authorized\n", $userinput);
+    }
+
+    return 1;
+}
+register_handler("passwd", \&change_password_handler, 1, 1, 0);
+
+
+#
+#   Create a new user.  User in this case means a lon-capa user.
+#   The user must either already exist in some authentication realm
+#   like kerberos or the /etc/passwd.  If not, a user completely local to
+#   this loncapa system is created.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+sub add_user_handler {
+
+    my ($cmd, $tail, $client) = @_;
+
+
+    my ($udom,$uname,$umode,$npass)=split(/:/,$tail);
+    my $userinput = $cmd.":".$tail; # Reconstruct the full request line.
+
+    &Debug("cmd =".$cmd." $udom =".$udom." uname=".$uname);
+
+
+    if($udom eq $currentdomainid) { # Reject new users for other domains...
+	
+	my $oldumask=umask(0077);
+	chomp($npass);
+	$npass=&unescape($npass);
+	my $passfilename  = &password_path($udom, $uname);
+	&Debug("Password file created will be:".$passfilename);
+	if (-e $passfilename) {
+	    &Failure( $client, "already_exists\n", $userinput);
+	} else {
+	    my @fpparts=split(/\//,$passfilename);
+	    my $fpnow=$fpparts[0].'/'.$fpparts[1].'/'.$fpparts[2];
+	    my $fperror='';
+	    for (my $i=3;$i<= ($#fpparts-1);$i++) {
+		$fpnow.='/'.$fpparts[$i]; 
+		unless (-e $fpnow) {
+		    &logthis("mkdir $fpnow");
+		    unless (mkdir($fpnow,0777)) {
+			$fperror="error: ".($!+0)." mkdir failed while attempting "
+			    ."makeuser";
+		    }
+		}
+	    }
+	    unless ($fperror) {
+		my $result=&make_passwd_file($uname, $umode,$npass, $passfilename);
+		&Reply($client, $result, $userinput);     #BUGBUG - could be fail
+	    } else {
+		&Failure($client, "$fperror\n", $userinput);
+	    }
+	}
+	umask($oldumask);
+    }  else {
+	&Failure($client, "not_right_domain\n",
+		$userinput);	# Even if we are multihomed.
+    
+    }
+    return 1;
+
+}
+&register_handler("makeuser", \&add_user_handler, 1, 1, 0);
+
+#
+#   Change the authentication method of a user.  Note that this may
+#   also implicitly change the user's password if, for example, the user is
+#   joining an existing authentication realm.  Known authentication realms at
+#   this time are:
+#    internal   - Purely internal password file (only loncapa knows this user)
+#    local      - Institutionally written authentication module.
+#    unix       - Unix user (/etc/passwd with or without /etc/shadow).
+#    kerb4      - kerberos version 4
+#    kerb5      - kerberos version 5
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+#
+sub change_authentication_handler {
+
+    my ($cmd, $tail, $client) = @_;
+   
+    my $userinput  = "$cmd:$tail";              # Reconstruct user input.
+
+    my ($udom,$uname,$umode,$npass)=split(/:/,$tail);
+    &Debug("cmd = ".$cmd." domain= ".$udom."uname =".$uname." umode= ".$umode);
+    if ($udom ne $currentdomainid) {
+	&Failure( $client, "not_right_domain\n", $client);
+    } else {
+	
+	chomp($npass);
+	
+	$npass=&unescape($npass);
+	my $passfilename = &password_path($udom, $uname);
+	if ($passfilename) {	# Not allowed to create a new user!!
+	    my $result=&make_passwd_file($uname, $umode,$npass,$passfilename);
+	    &Reply($client, $result, $userinput);
+	} else {	       
+	    &Failure($client, "non_authorized", $userinput); # Fail the user now.
+	}
+    }
+    return 1;
+}
+&register_handler("changeuserauth", \&change_authentication_handler, 1,1, 0);
+
+#
+#   Determines if this is the home server for a user.  The home server
+#   for a user will have his/her lon-capa passwd file.  Therefore all we need
+#   to do is determine if this file exists.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+#
+sub is_home_handler {
+    my ($cmd, $tail, $client) = @_;
+   
+    my $userinput  = "$cmd:$tail";
+   
+    my ($udom,$uname)=split(/:/,$tail);
+    chomp($uname);
+    my $passfile = &password_filename($udom, $uname);
+    if($passfile) {
+	&Reply( $client, "found\n", $userinput);
+    } else {
+	&Failure($client, "not_found\n", $userinput);
+    }
+    return 1;
+}
+&register_handler("home", \&is_home_handler, 0,1,0);
+
+#
+#   Process an update request for a resource?? I think what's going on here is
+#   that a resource has been modified that we hold a subscription to.
+#   If the resource is not local, then we must update, or at least invalidate our
+#   cached copy of the resource. 
+#   FUTURE WORK:
+#      I need to look at this logic carefully.  My druthers would be to follow
+#      typical caching logic, and simple invalidate the cache, drop any subscription
+#      an let the next fetch start the ball rolling again... however that may
+#      actually be more difficult than it looks given the complex web of
+#      proxy servers.
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+#
+sub update_resource_handler {
+
+    my ($cmd, $tail, $client) = @_;
+   
+    my $userinput = "$cmd:$tail";
+   
+    my $fname= $tail;		# This allows interactive testing
+
+
+    my $ownership=ishome($fname);
+    if ($ownership eq 'not_owner') {
+	if (-e $fname) {
+	    my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+		$atime,$mtime,$ctime,$blksize,$blocks)=stat($fname);
+	    my $now=time;
+	    my $since=$now-$atime;
+	    if ($since>$perlvar{'lonExpire'}) {
+		my $reply=&reply("unsub:$fname","$clientname");
+		unlink("$fname");
+	    } else {
+		my $transname="$fname.in.transfer";
+		my $remoteurl=&reply("sub:$fname","$clientname");
+		my $response;
+		alarm(120);
+		{
+		    my $ua=new LWP::UserAgent;
+		    my $request=new HTTP::Request('GET',"$remoteurl");
+		    $response=$ua->request($request,$transname);
+		}
+		alarm(0);
+		if ($response->is_error()) {
+		    unlink($transname);
+		    my $message=$response->status_line;
+		    &logthis("LWP GET: $message for $fname ($remoteurl)");
+		} else {
+		    if ($remoteurl!~/\.meta$/) {
+			alarm(120);
+			{
+			    my $ua=new LWP::UserAgent;
+			    my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
+			    my $mresponse=$ua->request($mrequest,$fname.'.meta');
+			    if ($mresponse->is_error()) {
+				unlink($fname.'.meta');
+			    }
+			}
+			alarm(0);
+		    }
+		    rename($transname,$fname);
+		}
+	    }
+	    &Reply( $client, "ok\n", $userinput);
+	} else {
+	    &Failure($client, "not_found\n", $userinput);
+	}
+    } else {
+	&Failure($client, "rejected\n", $userinput);
+    }
+    return 1;
+}
+&register_handler("update", \&update_resource_handler, 0 ,1, 0);
+
+#
+#   Fetch a user file from a remote server to the user's home directory
+#   userfiles subdir.
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub fetch_user_file_handler {
+
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput = "$cmd:$tail";
+    my $fname           = $tail;
+    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 $destname=$udir.'/'.$ufile;
+	my $transname=$udir.'/'.$ufile.'.in.transit';
+	my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
+	my $response;
+	alarm(120);
+	{
+	    my $ua=new LWP::UserAgent;
+	    my $request=new HTTP::Request('GET',"$remoteurl");
+	    $response=$ua->request($request,$transname);
+	}
+	alarm(0);
+	if ($response->is_error()) {
+	    unlink($transname);
+	    my $message=$response->status_line;
+	    &logthis("LWP GET: $message for $fname ($remoteurl)");
+	    &Failure($client, "failed\n", $userinput);
+	} else {
+	    if (!rename($transname,$destname)) {
+		&logthis("Unable to move $transname to $destname");
+		unlink($transname);
+		&Failure($client, "failed\n", $userinput);
+	    } else {
+		&Reply($client, "ok\n", $userinput);
+	    }
+	}   
+    } else {
+	&Failure($client, "not_home\n", $userinput);
+    }
+    return 1;
+}
+&register_handler("fetchuserfile", \&fetch_user_file_handler, 0, 1, 0);
+
+#
+#   Remove a file from a user's home directory userfiles subdirectory.
+# Parameters:
+#    cmd   - the Lond request keyword that got us here.
+#    tail  - the part of the command past the keyword.
+#    client- File descriptor connected with the client.
+#
+# Returns:
+#    1    - Continue processing.
+
+sub remove_user_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my ($fname) = split(/:/, $tail); # Get rid of any tailing :'s lonc may have sent.
+
+    my ($udom,$uname,$ufile) = ($fname =~ m|^([^/]+)/([^/]+)/(.+)$|);
+    if ($ufile =~m|/\.\./|) {
+	# any files paths with /../ in them refuse 
+	# to deal with
+	&Failure($client, "refused\n", "$cmd:$tail");
+    } else {
+	my $udir = &propath($udom,$uname);
+	if (-e $udir) {
+	    my $file=$udir.'/userfiles/'.$ufile;
+	    if (-e $file) {
+		unlink($file);
+		if (-e $file) {
+		    &Failure($client, "failed\n", "$cmd:$tail");
+		} else {
+		    &Reply($client, "ok\n", "$cmd:$tail");
+		}
+	    } else {
+		&Failure($client, "not_found\n", "$cmd:$tail");
+	    }
+	} else {
+	    &Failure($client, "not_home\n", "$cmd:$tail");
+	}
+    }
+    return 1;
+}
+&register_handler("removeuserfile", \&remove_user_file_handler, 0,1,0);
+
+
+#
+#  Authenticate access to a user file by checking the user's 
+#  session token(?)
+#
+# Parameters:
+#   cmd      - The request keyword that dispatched to tus.
+#   tail     - The tail of the request (colon separated parameters).
+#   client   - Filehandle open on the client.
+# Return:
+#    1.
+
+sub token_auth_user_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my ($fname, $session) = split(/:/, $tail);
+    
+    chomp($session);
+    my $reply='non_auth';
+    if (open(ENVIN,$perlvar{'lonIDsDir'}.'/'.
+	     $session.'.id')) {
+	while (my $line=<ENVIN>) {
+	    if ($line=~ m|userfile\.\Q$fname\E\=|) { $reply='ok'; }
+	}
+	close(ENVIN);
+	&Reply($client, $reply);
+    } else {
+	&Failure($client, "invalid_token\n", "$cmd:$tail");
+    }
+    return 1;
+
+}
+
+&register_handler("tokenauthuserfile", \&token_auth_user_file_handler, 0,1,0);
+
+
+#
+#   Unsubscribe from a resource.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub unsubscribe_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput= "$cmd:$tail";
+    
+    my ($fname) = split(/:/,$tail); # Split in case there's extrs.
+
+    &Debug("Unsubscribing $fname");
+    if (-e $fname) {
+	&Debug("Exists");
+	&Reply($client, &unsub($fname,$clientip), $userinput);
+    } else {
+	&Failure($client, "not_found\n", $userinput);
+    }
+    return 1;
+}
+&register_handler("unsub", \&unsubscribe_handler, 0, 1, 0);
+#   Subscribe to a resource
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub subscribe_handler {
+    my ($cmd, $tail, $client)= @_;
+
+    my $userinput  = "$cmd:$tail";
+
+    &Reply( $client, &subscribe($userinput,$clientip), $userinput);
+
+    return 1;
+}
+&register_handler("sub", \&subscribe_handler, 0, 1, 0);
+
+#
+#   Determine the version of a resource (?) Or is it return
+#   the top version of the resource?  Not yet clear from the
+#   code in currentversion.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub current_version_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput= "$cmd:$tail";
+   
+    my $fname   = $tail;
+    &Reply( $client, &currentversion($fname)."\n", $userinput);
+    return 1;
+
+}
+&register_handler("currentversion", \&current_version_handler, 0, 1, 0);
+
+#  Make an entry in a user's activity log.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub activity_log_handler {
+    my ($cmd, $tail, $client) = @_;
+
+
+    my $userinput= "$cmd:$tail";
+
+    my ($udom,$uname,$what)=split(/:/,$tail);
+    chomp($what);
+    my $proname=&propath($udom,$uname);
+    my $now=time;
+    my $hfh;
+    if ($hfh=IO::File->new(">>$proname/activity.log")) { 
+	print $hfh "$now:$clientname:$what\n";
+	&Reply( $client, "ok\n", $userinput); 
+    } else {
+	&Failure($client, "error: ".($!+0)." IO::File->new Failed "
+		 ."while attempting log\n", 
+		 $userinput);
+    }
+
+    return 1;
+}
+register_handler("log", \&activity_log_handler, 0, 1, 0);
+
+#
+#   Put a namespace entry in a user profile hash.
+#   My druthers would be for this to be an encrypted interaction too.
+#   anything that might be an inadvertent covert channel about either
+#   user authentication or user personal information....
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub put_user_profile_entry {
+    my ($cmd, $tail, $client)  = @_;
+
+    my $userinput = "$cmd:$tail";
+    
+    my ($udom,$uname,$namespace,$what) =split(/:/,$tail);
+    if ($namespace ne 'roles') {
+	chomp($what);
+	my $hashref = &tie_user_hash($udom, $uname, $namespace,
+				  &GDBM_WRCREAT(),"P",$what);
+	if($hashref) {
+	    my @pairs=split(/\&/,$what);
+	    foreach my $pair (@pairs) {
+		my ($key,$value)=split(/=/,$pair);
+		$hashref->{$key}=$value;
+	    }
+	    if (untie(%$hashref)) {
+		&Reply( $client, "ok\n", $userinput);
+	    } else {
+		&Failure($client, "error: ".($!+0)." untie(GDBM) failed ".
+			"while attempting put\n", 
+			$userinput);
+	    }
+	} else {
+	    &Failure( $client, "error: ".($!)." tie(GDBM) Failed ".
+		     "while attempting put\n", $userinput);
+	}
+    } else {
+        &Failure( $client, "refused\n", $userinput);
+    }
+    
+    return 1;
+}
+&register_handler("put", \&put_user_profile_entry, 0, 1, 0);
+
+# 
+#   Increment a profile entry in the user history file.
+#   The history contains keyword value pairs.  In this case,
+#   The value itself is a pair of numbers.  The first, the current value
+#   the second an increment that this function applies to the current
+#   value.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+#
+sub increment_user_value_handler {
+    my ($cmd, $tail, $client) = @_;
+    
+    my $userinput   = "$cmd:$tail";
+    
+    my ($udom,$uname,$namespace,$what) =split(/:/,$tail);
+    if ($namespace ne 'roles') {
+        chomp($what);
+	my $hashref = &tie_user_hash($udom, $uname,
+				     $namespace, &GDBM_WRCREAT(),
+				     "P",$what);
+	if ($hashref) {
+	    my @pairs=split(/\&/,$what);
+	    foreach my $pair (@pairs) {
+		my ($key,$value)=split(/=/,$pair);
+		# We could check that we have a number...
+		if (! defined($value) || $value eq '') {
+		    $value = 1;
+		}
+		$hashref->{$key}+=$value;
+	    }
+	    if (untie(%$hashref)) {
+		&Reply( $client, "ok\n", $userinput);
+	    } else {
+		&Failure($client, "error: ".($!+0)." untie(GDBM) failed ".
+			 "while attempting inc\n", $userinput);
+	    }
+	} else {
+	    &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+		     "while attempting inc\n", $userinput);
+	}
+    } else {
+	&Failure($client, "refused\n", $userinput);
+    }
+    
+    return 1;
+}
+&register_handler("inc", \&increment_user_value_handler, 0, 1, 0);
+
+
+#
+#   Put a new role for a user.  Roles are LonCAPA's packaging of permissions.
+#   Each 'role' a user has implies a set of permissions.  Adding a new role
+#   for a person grants the permissions packaged with that role
+#   to that user when the role is selected.
+#
+# Parameters:
+#    $cmd       - The command string (rolesput).
+#    $tail      - The remainder of the request line.  For rolesput this
+#                 consists of a colon separated list that contains:
+#                 The domain and user that is granting the role (logged).
+#                 The domain and user that is getting the role.
+#                 The roles being granted as a set of & separated pairs.
+#                 each pair a key value pair.
+#    $client    - File descriptor connected to the client.
+# Returns:
+#     0         - If the daemon should exit
+#     1         - To continue processing.
+#
+#
+sub roles_put_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput  = "$cmd:$tail";
+
+    my ( $exedom, $exeuser, $udom, $uname,  $what) = split(/:/,$tail);
+    
+
+    my $namespace='roles';
+    chomp($what);
+    my $hashref = &tie_user_hash($udom, $uname, $namespace,
+				 &GDBM_WRCREAT(), "P",
+				 "$exedom:$exeuser:$what");
+    #
+    #  Log the attempt to set a role.  The {}'s here ensure that the file 
+    #  handle is open for the minimal amount of time.  Since the flush
+    #  is done on close this improves the chances the log will be an un-
+    #  corrupted ordered thing.
+    if ($hashref) {
+	my @pairs=split(/\&/,$what);
+	foreach my $pair (@pairs) {
+	    my ($key,$value)=split(/=/,$pair);
+	    &manage_permissions($key, $udom, $uname,
+			       &get_auth_type( $udom, $uname));
+	    $hashref->{$key}=$value;
+	}
+	if (untie($hashref)) {
+	    &Reply($client, "ok\n", $userinput);
+	} else {
+	    &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
+		     "while attempting rolesput\n", $userinput);
+	}
+    } else {
+	&Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+		 "while attempting rolesput\n", $userinput);
+    }
+    return 1;
+}
+&register_handler("rolesput", \&roles_put_handler, 1,1,0);  # Encoded client only.
+
+#
+#---------------------------------------------------------------
+#
+#   Getting, decoding and dispatching requests:
+#
+
+#
+#   Get a Request:
+#   Gets a Request message from the client.  The transaction
+#   is defined as a 'line' of text.  We remove the new line
+#   from the text line.  
+#
+sub get_request {
+    my $input = <$client>;
+    chomp($input);
+
+    Debug("get_request: Request = $input\n");
+
+    &status('Processing '.$clientname.':'.$input);
+
+    return $input;
+}
+#---------------------------------------------------------------
+#
+#  Process a request.  This sub should shrink as each action
+#  gets farmed out into a separat sub that is registered 
+#  with the dispatch hash.  
+#
+# Parameters:
+#    user_input   - The request received from the client (lonc).
+# Returns:
+#    true to keep processing, false if caller should exit.
+#
+sub process_request {
+    my ($userinput) = @_;      # Easier for now to break style than to
+                                # fix all the userinput -> user_input.
+    my $wasenc    = 0;		# True if request was encrypted.
+# ------------------------------------------------------------ See if encrypted
+    if ($userinput =~ /^enc/) {
+	$userinput = decipher($userinput);
+	$wasenc=1;
+	if(!$userinput) {	# Cipher not defined.
+	    &Failure($client, "error: Encrypted data without negotated key");
+	    return 0;
+	}
+    }
+    Debug("process_request: $userinput\n");
+    
+    #  
+    #   The 'correct way' to add a command to lond is now to
+    #   write a sub to execute it and Add it to the command dispatch
+    #   hash via a call to register_handler..  The comments to that
+    #   sub should give you enough to go on to show how to do this
+    #   along with the examples that are building up as this code
+    #   is getting refactored.   Until all branches of the
+    #   if/elseif monster below have been factored out into
+    #   separate procesor subs, if the dispatch hash is missing
+    #   the command keyword, we will fall through to the remainder
+    #   of the if/else chain below in order to keep this thing in 
+    #   working order throughout the transmogrification.
+
+    my ($command, $tail) = split(/:/, $userinput, 2);
+    chomp($command);
+    chomp($tail);
+    $tail =~ s/(\r)//;		# This helps people debugging with e.g. telnet.
+    $command =~ s/(\r)//;	# And this too for parameterless commands.
+    if(!$tail) {
+	$tail ="";		# defined but blank.
+    }
+
+    &Debug("Command received: $command, encoded = $wasenc");
+
+    if(defined $Dispatcher{$command}) {
+
+	my $dispatch_info = $Dispatcher{$command};
+	my $handler       = $$dispatch_info[0];
+	my $need_encode   = $$dispatch_info[1];
+	my $client_types  = $$dispatch_info[2];
+	Debug("Matched dispatch hash: mustencode: $need_encode "
+	      ."ClientType $client_types");
+      
+	#  Validate the request:
+      
+	my $ok = 1;
+	my $requesterprivs = 0;
+	if(&isClient()) {
+	    $requesterprivs |= $CLIENT_OK;
+	}
+	if(&isManager()) {
+	    $requesterprivs |= $MANAGER_OK;
+	}
+	if($need_encode && (!$wasenc)) {
+	    Debug("Must encode but wasn't: $need_encode $wasenc");
+	    $ok = 0;
+	}
+	if(($client_types & $requesterprivs) == 0) {
+	    Debug("Client not privileged to do this operation");
+	    $ok = 0;
+	}
+
+	if($ok) {
+	    Debug("Dispatching to handler $command $tail");
+	    my $keep_going = &$handler($command, $tail, $client);
+	    return $keep_going;
+	} else {
+	    Debug("Refusing to dispatch because client did not match requirements");
+	    Failure($client, "refused\n", $userinput);
+	    return 1;
+	}
+
+    }    
+
+#------------------- Commands not yet in spearate handlers. --------------
+
+
+# -------------------------------------------------------------------- rolesdel
+    if ($userinput =~ /^rolesdel/) {
+	if(isClient) {
+	    &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 @rolekeys=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		    {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { 
+			    print $hfh "D:$now:$exedom:$exeuser:$what\n";
+			}
+		    }
+		    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";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------- get
+    } elsif ($userinput =~ /^get/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($what);
+	    my @queries=split(/\&/,$what);
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    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: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting get\n";
+		}
+	    } else {
+		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";
+		}
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------ eget
+    } elsif ($userinput =~ /^eget/) {
+	if (isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($what);
+	    my @queries=split(/\&/,$what);
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    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/\&$//;
+		    if ($cipher) {
+			my $cmdlength=length($qresult);
+			$qresult.="         ";
+			my $encqresult='';
+			for 
+			    (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+				$encqresult.=
+				    unpack("H16",
+					   $cipher->encrypt(substr($qresult,$encidx,8)));
+			    }
+			print $client "enc:$cmdlength:$encqresult\n";
+		    } else {
+			print $client "error:no_key\n";
+		    }
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting eget\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting eget\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------- del
+    } elsif ($userinput =~ /^del/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($what);
+	    my $proname=propath($udom,$uname);
+	    my $now=time;
+	    my @keys=split(/\&/,$what);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		unless ($namespace=~/^nohist\_/) {
+		    my $hfh;
+		    if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { print $hfh "D:$now:$what\n"; }
+		}
+		foreach my $key (@keys) {
+		    delete($hash{$key});
+		}
+		if (untie(%hash)) {
+		    print $client "ok\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting del\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting del\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------ keys
+    } elsif ($userinput =~ /^keys/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    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: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting keys\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting keys\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------- dumpcurrent
+    } elsif ($userinput =~ /^currentdump/) {
+	if (isClient) {
+	    my ($cmd,$udom,$uname,$namespace)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    my $qresult='';
+	    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";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting currentdump\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	}
+# ------------------------------------------------------------------------ dump
+    } elsif ($userinput =~ /^dump/) {
+	if(isClient) {
+	    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)) {
+		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: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting dump\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting dump\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------------- store
+    } elsif ($userinput =~ /^store/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$rid,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    if ($namespace ne 'roles') {
+		chomp($what);
+		my $proname=propath($udom,$uname);
+		my $now=time;
+		my @pairs=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		    unless ($namespace=~/^nohist\_/) {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) {
+			    print $hfh "P:$now:$rid:$what\n";
+			}
+		    }
+		    my @previouskeys=split(/&/,$hash{"keys:$rid"});
+		    my $key;
+		    $hash{"version:$rid"}++;
+		    my $version=$hash{"version:$rid"};
+		    my $allkeys=''; 
+		    foreach my $pair (@pairs) {
+			my ($key,$value)=split(/=/,$pair);
+			$allkeys.=$key.':';
+			$hash{"$version:$rid:$key"}=$value;
+		    }
+		    $hash{"$version:$rid:timestamp"}=$now;
+		    $allkeys.='timestamp';
+		    $hash{"$version:keys:$rid"}=$allkeys;
+		    if (untie(%hash)) {
+			print $client "ok\n";
+		    } else {
+			print $client "error: ".($!+0)
+			    ." untie(GDBM) Failed ".
+			    "while attempting store\n";
+				}
+		} else {
+		    print $client "error: ".($!+0)
+			." tie(GDBM) Failed ".
+			"while attempting store\n";
+		}
+	    } else {
+		print $client "refused\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# --------------------------------------------------------------------- restore
+    } elsif ($userinput =~ /^restore/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$rid)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($rid);
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+		my $version=$hash{"version:$rid"};
+		$qresult.="version=$version&";
+		my $scope;
+		for ($scope=1;$scope<=$version;$scope++) {
+		    my $vkeys=$hash{"$scope:keys:$rid"};
+		    my @keys=split(/:/,$vkeys);
+		    my $key;
+		    $qresult.="$scope:keys=$vkeys&";
+		    foreach $key (@keys) {
+			$qresult.="$scope:$key=".$hash{"$scope:$rid:$key"}."&";
+		    }                                  
+		}
+		if (untie(%hash)) {
+		    $qresult=~s/\&$//;
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting restore\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting restore\n";
+	    }
+	} else  {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# -------------------------------------------------------------------- chatsend
+    } elsif ($userinput =~ /^chatsend/) {
+	if(isClient) {
+	    my ($cmd,$cdom,$cnum,$newpost)=split(/\:/,$userinput);
+	    &chatadd($cdom,$cnum,$newpost);
+	    print $client "ok\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# -------------------------------------------------------------------- chatretr
+    } elsif ($userinput =~ /^chatretr/) {
+	if(isClient) {
+	    my 
+		($cmd,$cdom,$cnum,$udom,$uname)=split(/\:/,$userinput);
+	    my $reply='';
+	    foreach (&getchat($cdom,$cnum,$udom,$uname)) {
+		$reply.=&escape($_).':';
+	    }
+	    $reply=~s/\:$//;
+	    print $client $reply."\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------- querysend
+    } elsif ($userinput =~ /^querysend/) {
+	if (isClient) {
+	    my ($cmd,$query,
+		$arg1,$arg2,$arg3)=split(/\:/,$userinput);
+	    $query=~s/\n*$//g;
+	    print $client "".
+		sqlreply("$clientname\&$query".
+			 "\&$arg1"."\&$arg2"."\&$arg3")."\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------ queryreply
+    } elsif ($userinput =~ /^queryreply/) {
+	if(isClient) {
+	    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: ".($!+0)
+		    ." IO::File->new Failed ".
+		    "while attempting queryreply\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------- courseidput
+    } elsif ($userinput =~ /^courseidput/) {
+	if(isClient) {
+	    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,$descr,$inst_code)=split(/=/,$pair);
+		    $hash{$key}=$descr.':'.$inst_code.':'.$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";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ---------------------------------------------------------------- courseiddump
+    } elsif ($userinput =~ /^courseiddump/) {
+	if(isClient) {
+	    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,$inst_code);
+		    if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
+			($descr,$inst_code,$lasttime)=($1,$2,$3);
+		    } else {
+			($descr,$lasttime) = split(/\:/,$value);
+		    }
+		    if ($lasttime<$since) { next; }
+		    if ($description eq '.') {
+			$qresult.=$key.'='.$descr.':'.$inst_code.'&';
+		    } else {
+			my $unescapeVal = &unescape($descr);
+			if (eval('$unescapeVal=~/\Q$description\E/i')) {
+			    $qresult.=$key.'='.$descr.':'.$inst_code.'&';
+			}
+		    }
+		}
+		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";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------------- idput
+    } elsif ($userinput =~ /^idput/) {
+	if(isClient) {
+	    my ($cmd,$udom,$what)=split(/:/,$userinput);
+	    chomp($what);
+	    $udom=~s/\W//g;
+	    my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
+	    my $now=time;
+	    my @pairs=split(/\&/,$what);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
+		{
+		    my $hfh;
+		    if ($hfh=IO::File->new(">>$proname.hist")) {
+			print $hfh "P:$now:$what\n";
+		    }
+		}
+		foreach my $pair (@pairs) {
+		    my ($key,$value)=split(/=/,$pair);
+		    $hash{$key}=$value;
+		}
+		if (untie(%hash)) {
+		    print $client "ok\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting idput\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting idput\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------------- idget
+    } elsif ($userinput =~ /^idget/) {
+	if(isClient) {
+	    my ($cmd,$udom,$what)=split(/:/,$userinput);
+	    chomp($what);
+	    $udom=~s/\W//g;
+	    my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
+	    my @queries=split(/\&/,$what);
+	    my $qresult='';
+	    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";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting idget\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting idget\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ---------------------------------------------------------------------- tmpput
+    } elsif ($userinput =~ /^tmpput/) {
+	if(isClient) {
+	    my ($cmd,$what)=split(/:/,$userinput);
+	    my $store;
+	    $tmpsnum++;
+	    my $id=$$.'_'.$clientip.'_'.$tmpsnum;
+	    $id=~s/\W/\_/g;
+	    $what=~s/\n//g;
+	    my $execdir=$perlvar{'lonDaemons'};
+	    if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
+		print $store $what;
+		close $store;
+		print $client "$id\n";
+	    }
+	    else {
+		print $client "error: ".($!+0)
+		    ."IO::File->new Failed ".
+		    "while attempting tmpput\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+	
+# ---------------------------------------------------------------------- tmpget
+    } elsif ($userinput =~ /^tmpget/) {
+	if(isClient) {
+	    my ($cmd,$id)=split(/:/,$userinput);
+	    chomp($id);
+	    $id=~s/\W/\_/g;
+	    my $store;
+	    my $execdir=$perlvar{'lonDaemons'};
+	    if ($store=IO::File->new("$execdir/tmp/$id.tmp")) {
+		my $reply=<$store>;
+			    print $client "$reply\n";
+		close $store;
+	    }
+	    else {
+		print $client "error: ".($!+0)
+		    ."IO::File->new Failed ".
+		    "while attempting tmpget\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ---------------------------------------------------------------------- tmpdel
+    } elsif ($userinput =~ /^tmpdel/) {
+	if(isClient) {
+	    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";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------- portfolio directory list (portls)
+    } elsif ($userinput =~ /^portls/) {
+	if(isClient) {
+	    my ($cmd,$uname,$udom)=split(/:/,$userinput);
+	    my $udir=propath($udom,$uname).'/userfiles/portfolio';
+	    my $dirLine='';
+	    my $dirContents='';
+	    if (opendir(LSDIR,$udir.'/')){
+		while ($dirLine = readdir(LSDIR)){
+		    $dirContents = $dirContents.$dirLine.'<br />';
+		}
+	    } else {
+		$dirContents = "No directory found\n";
+	    }
+	    print $client $dirContents."\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	}
+# -------------------------------------------------------------------------- ls
+    } elsif ($userinput =~ /^ls/) {
+	if(isClient) {
+	    my $obs;
+	    my $rights;
+	    my ($cmd,$ulsdir)=split(/:/,$userinput);
+	    my $ulsout='';
+	    my $ulsfn;
+	    if (-e $ulsdir) {
+		if(-d $ulsdir) {
+		    if (opendir(LSDIR,$ulsdir)) {
+			while ($ulsfn=readdir(LSDIR)) {
+			    undef $obs, $rights; 
+			    my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+			    #We do some obsolete checking here
+			    if(-e $ulsdir.'/'.$ulsfn.".meta") { 
+				open(FILE, $ulsdir.'/'.$ulsfn.".meta");
+				my @obsolete=<FILE>;
+				foreach my $obsolete (@obsolete) {
+				    if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+				    if($obsolete =~ m|(<copyright>)(default)|) { $rights = 1; }
+				}
+			    }
+			    $ulsout.=$ulsfn.'&'.join('&',@ulsstats);
+			    if($obs eq '1') { $ulsout.="&1"; }
+			    else { $ulsout.="&0"; }
+			    if($rights eq '1') { $ulsout.="&1:"; }
+			    else { $ulsout.="&0:"; }
+			}
+			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";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------- setannounce
+    } elsif ($userinput =~ /^setannounce/) {
+	if (isClient) {
+	    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";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------ Hanging up
+    } elsif (($userinput =~ /^exit/) ||
+	     ($userinput =~ /^init/)) { # no restrictions.
+	&logthis(
+		 "Client $clientip ($clientname) hanging up: $userinput");
+	print $client "bye\n";
+	$client->shutdown(2);        # shutdown the socket forcibly.
+	$client->close();
+	return 0;
+	
+# ---------------------------------- set current host/domain
+    } elsif ($userinput =~ /^sethost:/) {
+	if (isClient) {
+	    print $client &sethost($userinput)."\n";
+	} else {
+	    print $client "refused\n";
+	}
+#---------------------------------- request file (?) version.
+    } elsif ($userinput =~/^version:/) {
+	if (isClient) {
+	    print $client &version($userinput)."\n";
+	} else {
+	    print $client "refused\n";
+	}
+#------------------------------- is auto-enrollment enabled?
+    } elsif ($userinput =~/^autorun:/) {
+	if (isClient) {
+	    my ($cmd,$cdom) = split(/:/,$userinput);
+	    my $outcome = &localenroll::run($cdom);
+	    print $client "$outcome\n";
+	} else {
+	    print $client "0\n";
+	}
+#------------------------------- get official sections (for auto-enrollment).
+    } elsif ($userinput =~/^autogetsections:/) {
+	if (isClient) {
+	    my ($cmd,$coursecode,$cdom)=split(/:/,$userinput);
+	    my @secs = &localenroll::get_sections($coursecode,$cdom);
+	    my $seclist = &escape(join(':',@secs));
+	    print $client "$seclist\n";
+	} else {
+	    print $client "refused\n";
+	}
+#----------------------- validate owner of new course section (for auto-enrollment).
+    } elsif ($userinput =~/^autonewcourse:/) {
+	if (isClient) {
+	    my ($cmd,$inst_course_id,$owner,$cdom)=split(/:/,$userinput);
+	    my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
+	    print $client "$outcome\n";
+	} else {
+	    print $client "refused\n";
+	}
+#-------------- validate course section in schedule of classes (for auto-enrollment).
+    } elsif ($userinput =~/^autovalidatecourse:/) {
+	if (isClient) {
+	    my ($cmd,$inst_course_id,$cdom)=split(/:/,$userinput);
+	    my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
+	    print $client "$outcome\n";
+	} else {
+	    print $client "refused\n";
+	}
+#--------------------------- create password for new user (for auto-enrollment).
+    } elsif ($userinput =~/^autocreatepassword:/) {
+	if (isClient) {
+	    my ($cmd,$authparam,$cdom)=split(/:/,$userinput);
+	    my ($create_passwd,$authchk);
+	    ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam,$cdom);
+	    print $client &escape($authparam.':'.$create_passwd.':'.$authchk)."\n";
+	} else {
+	    print $client "refused\n";
+	}
+#---------------------------  read and remove temporary files (for auto-enrollment).
+    } elsif ($userinput =~/^autoretrieve:/) {
+	if (isClient) {
+	    my ($cmd,$filename) = split(/:/,$userinput);
+	    my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
+	    if ( (-e $source) && ($filename ne '') ) {
+		my $reply = '';
+		if (open(my $fh,$source)) {
+		    while (<$fh>) {
+			chomp($_);
+			$_ =~ s/^\s+//g;
+			$_ =~ s/\s+$//g;
+			$reply .= $_;
+		    }
+		    close($fh);
+		    print $client &escape($reply)."\n";
+#                                unlink($source);
+		} else {
+		    print $client "error\n";
+		}
+	    } else {
+		print $client "error\n";
+	    }
+	} else {
+	    print $client "refused\n";
+	}
+#---------------------  read and retrieve institutional code format (for support form).
+    } elsif ($userinput =~/^autoinstcodeformat:/) {
+	if (isClient) {
+	    my $reply;
+	    my($cmd,$cdom,$course) = split(/:/,$userinput);
+	    my @pairs = split/\&/,$course;
+	    my %instcodes = ();
+	    my %codes = ();
+	    my @codetitles = ();
+	    my %cat_titles = ();
+	    my %cat_order = ();
+	    foreach (@pairs) {
+		my ($key,$value) = split/=/,$_;
+		$instcodes{&unescape($key)} = &unescape($value);
+	    }
+	    my $formatreply = &localenroll::instcode_format($cdom,\%instcodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+	    if ($formatreply eq 'ok') {
+		my $codes_str = &hash2str(%codes);
+		my $codetitles_str = &array2str(@codetitles);
+		my $cat_titles_str = &hash2str(%cat_titles);
+		my $cat_order_str = &hash2str(%cat_order);
+		print $client $codes_str.':'.$codetitles_str.':'.$cat_titles_str.':'.$cat_order_str."\n";
+	    }
+	} else {
+	    print $client "refused\n";
+	}
+# ------------------------------------------------------------- unknown command
+	
+    } else {
+	# unknown command
+	print $client "unknown_cmd\n";
+    }
+# -------------------------------------------------------------------- complete
+    Debug("process_request - returning 1");
+    return 1;
+}
+#
+#   Decipher encoded traffic
+#  Parameters:
+#     input      - Encoded data.
+#  Returns:
+#     Decoded data or undef if encryption key was not yet negotiated.
+#  Implicit input:
+#     cipher  - This global holds the negotiated encryption key.
+#
+sub decipher {
+    my ($input)  = @_;
+    my $output = '';
+    
+    
+    if($cipher) {
+	my($enc, $enclength, $encinput) = split(/:/, $input);
+	for(my $encidx = 0; $encidx < length($encinput); $encidx += 16) {
+	    $output .= 
+		$cipher->decrypt(pack("H16", substr($encinput, $encidx, 16)));
+	}
+	return substr($output, 0, $enclength);
+    } else {
+	return undef;
+    }
+}
+
+#
+#   Register a command processor.  This function is invoked to register a sub
+#   to process a request.  Once registered, the ProcessRequest sub can automatically
+#   dispatch requests to an appropriate sub, and do the top level validity checking
+#   as well:
+#    - Is the keyword recognized.
+#    - Is the proper client type attempting the request.
+#    - Is the request encrypted if it has to be.
+#   Parameters:
+#    $request_name         - Name of the request being registered.
+#                           This is the command request that will match
+#                           against the hash keywords to lookup the information
+#                           associated with the dispatch information.
+#    $procedure           - Reference to a sub to call to process the request.
+#                           All subs get called as follows:
+#                             Procedure($cmd, $tail, $replyfd, $key)
+#                             $cmd    - the actual keyword that invoked us.
+#                             $tail   - the tail of the request that invoked us.
+#                             $replyfd- File descriptor connected to the client
+#    $must_encode          - True if the request must be encoded to be good.
+#    $client_ok            - True if it's ok for a client to request this.
+#    $manager_ok           - True if it's ok for a manager to request this.
+# Side effects:
+#      - On success, the Dispatcher hash has an entry added for the key $RequestName
+#      - On failure, the program will die as it's a bad internal bug to try to 
+#        register a duplicate command handler.
+#
+sub register_handler {
+    my ($request_name,$procedure,$must_encode,	$client_ok,$manager_ok)   = @_;
+
+    #  Don't allow duplication#
+   
+    if (defined $Dispatcher{$request_name}) {
+	die "Attempting to define a duplicate request handler for $request_name\n";
+    }
+    #   Build the client type mask:
+    
+    my $client_type_mask = 0;
+    if($client_ok) {
+	$client_type_mask  |= $CLIENT_OK;
+    }
+    if($manager_ok) {
+	$client_type_mask  |= $MANAGER_OK;
+    }
+   
+    #  Enter the hash:
+      
+    my @entry = ($procedure, $must_encode, $client_type_mask);
+   
+    $Dispatcher{$request_name} = \@entry;
+   
+}
+
+
+#------------------------------------------------------------------
+
+
+
+
 #
 #  Convert an error return code from lcpasswd to a string value.
 #
@@ -271,7 +3246,8 @@ sub catchexception {
     my ($error)=@_;
     $SIG{'QUIT'}='DEFAULT';
     $SIG{__DIE__}='DEFAULT';
-    &logthis("<font color=red>CRITICAL: "
+    &status("Catching exception");
+    &logthis("<font color='red'>CRITICAL: "
      ."ABNORMAL EXIT. Child $$ for server $thisserver died through "
      ."a crash with this error msg->[$error]</font>");
     &logthis('Famous last words: '.$status.' - '.$lastlog);
@@ -279,13 +3255,14 @@ sub catchexception {
     $server->close();
     die($error);
 }
-
 sub timeout {
-    &logthis("<font color=ref>CRITICAL: TIME OUT ".$$."</font>");
+    &status("Handling Timeout");
+    &logthis("<font color='red'>CRITICAL: TIME OUT ".$$."</font>");
     &catchexception('Timeout');
 }
 # -------------------------------- Set signal handlers to record abnormal exits
 
+
 $SIG{'QUIT'}=\&catchexception;
 $SIG{__DIE__}=\&catchexception;
 
@@ -318,17 +3295,7 @@ if (-e $pidfile) {
 
 # ------------------------------------------------------------- Read hosts file
 
-open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
 
-while (my $configline=<CONFIG>) {
-    my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
-    chomp($ip); $ip=~s/\D+$//;
-    $hostid{$ip}=$id;
-    $hostdom{$id}=$domain;
-    $hostip{$id}=$ip;
-    if ($id eq $perlvar{'lonHostID'}) { $thisserver=$name; }
-}
-close(CONFIG);
 
 # establish SERVER socket, bind and listen.
 $server = IO::Socket::INET->new(LocalPort => $perlvar{'londPort'},
@@ -343,55 +3310,171 @@ $server = IO::Socket::INET->new(LocalPor
 # global variables
 
 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;
-    if (defined($children{$pid})) {
-	&logthis("Child $pid died");
-	$children --;
-	delete $children{$pid};
-    } else {
-	&logthis("Unknown Child $pid died");
+    &status("Handling child death");
+    my $pid;
+    do {
+	$pid = waitpid(-1,&WNOHANG());
+	if (defined($children{$pid})) {
+	    &logthis("Child $pid died");
+	    delete($children{$pid});
+	} elsif ($pid > 0) {
+	    &logthis("Unknown Child $pid died");
+	}
+    } while ( $pid > 0 );
+    foreach my $child (keys(%children)) {
+	$pid = waitpid($child,&WNOHANG());
+	if ($pid > 0) {
+	    &logthis("Child $child - $pid looks like we missed it's death");
+	    delete($children{$pid});
+	}
     }
+    &status("Finished Handling child death");
 }
 
 sub HUNTSMAN {                      # signal handler for SIGINT
+    &status("Killing children (INT)");
     local($SIG{CHLD}) = 'IGNORE';   # we're going to kill our children
     kill 'INT' => keys %children;
     &logthis("Free socket: ".shutdown($server,2)); # free up socket
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lond.pid");
-    &logthis("<font color=red>CRITICAL: Shutting down</font>");
+    &logthis("<font color='red'>CRITICAL: Shutting down</font>");
+    &status("Done killing children");
     exit;                           # clean up with dignity
 }
 
 sub HUPSMAN {                      # signal handler for SIGHUP
     local($SIG{CHLD}) = 'IGNORE';  # we're going to kill our children
+    &status("Killing children for restart (HUP)");
     kill 'INT' => keys %children;
     &logthis("Free socket: ".shutdown($server,2)); # free up socket
-    &logthis("<font color=red>CRITICAL: Restarting</font>");
+    &logthis("<font color='red'>CRITICAL: Restarting</font>");
     my $execdir=$perlvar{'lonDaemons'};
     unlink("$execdir/logs/lond.pid");
+    &status("Restarting self (HUP)");
     exec("$execdir/lond");         # here we go again
 }
 
+#
+#    Kill off hashes that describe the host table prior to re-reading it.
+#    Hashes affected are:
+#       %hostid, %hostdom %hostip %hostdns.
+#
+sub KillHostHashes {
+    foreach my $key (keys %hostid) {
+	delete $hostid{$key};
+    }
+    foreach my $key (keys %hostdom) {
+	delete $hostdom{$key};
+    }
+    foreach my $key (keys %hostip) {
+	delete $hostip{$key};
+    }
+    foreach my $key (keys %hostdns) {
+	delete $hostdns{$key};
+    }
+}
+#
+#   Read in the host table from file and distribute it into the various hashes:
+#
+#    - %hostid  -  Indexed by IP, the loncapa hostname.
+#    - %hostdom -  Indexed by  loncapa hostname, the domain.
+#    - %hostip  -  Indexed by hostid, the Ip address of the host.
+sub ReadHostTable {
+
+    open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
+    my $myloncapaname = $perlvar{'lonHostID'};
+    Debug("My loncapa name is : $myloncapaname");
+    while (my $configline=<CONFIG>) {
+	if (!($configline =~ /^\s*\#/)) {
+	    my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
+	    chomp($ip); $ip=~s/\D+$//;
+	    $hostid{$ip}=$id;         # LonCAPA name of host by IP.
+	    $hostdom{$id}=$domain;    # LonCAPA domain name of host. 
+	    $hostip{$id}=$ip;	      # IP address of host.
+	    $hostdns{$name} = $id;    # LonCAPA name of host by DNS.
+
+	    if ($id eq $perlvar{'lonHostID'}) { 
+		Debug("Found me in the host table: $name");
+		$thisserver=$name; 
+	    }
+	}
+    }
+    close(CONFIG);
+}
+#
+#  Reload the Apache daemon's state.
+#  This is done by invoking /home/httpd/perl/apachereload
+#  a setuid perl script that can be root for us to do this job.
+#
+sub ReloadApache {
+    my $execdir = $perlvar{'lonDaemons'};
+    my $script  = $execdir."/apachereload";
+    system($script);
+}
+
+#
+#   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 {
+    &status("Reload hosts.tab");
+    logthis('<font color="blue"> Updating connections </font>');
+    #
+    #  The %children hash has the set of IP's we currently have children
+    #  on.  These need to be matched against records in the hosts.tab
+    #  Any ip's no longer in the table get killed off they correspond to
+    #  either dropped or changed hosts.  Note that the re-read of the table
+    #  will take care of new and changed hosts as connections come into being.
+
+
+    KillHostHashes;
+    ReadHostTable;
+
+    foreach my $child (keys %children) {
+	my $childip = $children{$child};
+	if(!$hostid{$childip}) {
+	    logthis('<font color="blue"> UpdateHosts killing child '
+		    ." $child for ip $childip </font>");
+	    kill('INT', $child);
+	} else {
+	    logthis('<font color="green"> keeping child for ip '
+		    ." $childip (pid=$child) </font>");
+	}
+    }
+    ReloadApache;
+    &status("Finished reloading hosts.tab");
+}
+
+
 sub checkchildren {
+    &status("Checking on the children (sending signals)");
     &initnewstatus();
     &logstatus();
     &logthis('Going to check on the children');
     my $docdir=$perlvar{'lonDocRoot'};
     foreach (sort keys %children) {
-	sleep 1;
+	#sleep 1;
         unless (kill 'USR1' => $_) {
 	    &logthis ('Child '.$_.' is dead');
             &logstatus($$.' is dead');
+	    delete($children{$_});
         } 
     }
     sleep 5;
-    $SIG{ALRM} = sub { die "timeout" };
+    $SIG{ALRM} = sub { Debug("timeout"); 
+		       die "timeout";  };
     $SIG{__DIE__} = 'DEFAULT';
+    &status("Checking on the children (waiting for reports)");
     foreach (sort keys %children) {
         unless (-e "$docdir/lon-status/londchld/$_.txt") {
           eval {
@@ -403,12 +3486,15 @@ sub checkchildren {
 	    #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.$_`;
+	    delete($children{$_});
 	    alarm(0);
 	  }
         }
     }
     $SIG{ALRM} = 'DEFAULT';
-    $SIG{__DIE__} = \&cathcexception;
+    $SIG{__DIE__} = \&catchexception;
+    &status("Finished checking children");
+    &logthis('Finished Checking children');
 }
 
 # --------------------------------------------------------------------- Logging
@@ -430,20 +3516,69 @@ sub Debug {
 	&logthis($message);
     }
 }
+
+#
+#   Sub to do replies to client.. this gives a hook for some
+#   debug tracing too:
+#  Parameters:
+#     fd      - File open on client.
+#     reply   - Text to send to client.
+#     request - Original request from client.
+#
+sub Reply {
+    my ($fd, $reply, $request) = @_;
+    print $fd $reply;
+    Debug("Request was $request  Reply was $reply");
+
+    $Transactions++;
+
+
+}
+
+
+#
+#    Sub to report a failure.
+#    This function:
+#     -   Increments the failure statistic counters.
+#     -   Invokes Reply to send the error message to the client.
+# Parameters:
+#    fd       - File descriptor open on the client
+#    reply    - Reply text to emit.
+#    request  - The original request message (used by Reply
+#               to debug if that's enabled.
+# Implicit outputs:
+#    $Failures- The number of failures is incremented.
+#    Reply (invoked here) sends a message to the 
+#    client:
+#
+sub Failure {
+    my $fd      = shift;
+    my $reply   = shift;
+    my $request = shift;
+   
+    $Failures++;
+    Reply($fd, $reply, $request);      # That's simple eh?
+}
 # ------------------------------------------------------------------ Log status
 
 sub logstatus {
+    &status("Doing logging");
     my $docdir=$perlvar{'lonDocRoot'};
     {
-    my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
-    print $fh $$."\t".$currenthostid."\t".$status."\t".$lastlog."\n";
-    $fh->close();
-    }
-    {
 	my $fh=IO::File->new(">$docdir/lon-status/londchld/$$.txt");
-        print $fh $status."\n".$lastlog."\n".time;
+        print $fh $status."\n".$lastlog."\n".time."\n$keymode";
         $fh->close();
     }
+    &status("Finished $$.txt");
+    {
+	open(LOG,">>$docdir/lon-status/londstatus.txt");
+	flock(LOG,LOCK_EX);
+	print LOG $$."\t".$clientname."\t".$currenthostid."\t"
+	    .$status."\t".$lastlog."\t $keymode\n";
+	flock(DB,LOCK_UN);
+	close(LOG);
+    }
+    &status("Finished logging");
 }
 
 sub initnewstatus {
@@ -499,11 +3634,11 @@ sub reconlonc {
             kill USR1 => $loncpid;
         } else {
 	    &logthis(
-              "<font color=red>CRITICAL: "
+              "<font color='red'>CRITICAL: "
              ."lonc at pid $loncpid not responding, giving up</font>");
         }
     } else {
-      &logthis('<font color=red>CRITICAL: lonc not running, giving up</font>');
+      &logthis('<font color="red">CRITICAL: lonc not running, giving up</font>');
     }
 }
 
@@ -607,7 +3742,7 @@ my $execdir=$perlvar{'lonDaemons'};
 open (PIDSAVE,">$execdir/logs/lond.pid");
 print PIDSAVE "$$\n";
 close(PIDSAVE);
-&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
+&logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>");
 &status('Starting');
 
 
@@ -619,8 +3754,11 @@ $SIG{CHLD} = \&REAPER;
 $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;
 $SIG{HUP}  = \&HUPSMAN;
 $SIG{USR1} = \&checkchildren;
+$SIG{USR2} = \&UpdateHosts;
 
+#  Read the host hashes:
 
+ReadHostTable;
 
 # --------------------------------------------------------------
 #   Accept connections.  When a connection comes in, it is validated
@@ -628,30 +3766,58 @@ $SIG{USR1} = \&checkchildren;
 #   along the connection.
 
 while (1) {
+    &status('Starting accept');
     $client = $server->accept() or next;
+    &status('Accepted '.$client.' off to spawn');
     make_new_child($client);
+    &status('Finished spawning');
 }
 
 sub make_new_child {
     my $pid;
-    my $cipher;
+#    my $cipher;     # Now global
     my $sigset;
 
     $client = shift;
-    &logthis("Attempting to start child");    
+    &status('Starting new child '.$client);
+    &logthis('<font color="green"> Attempting to start child ('.$client.
+	     ")</font>");    
     # 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);
+
+    $client->sockopt(SO_KEEPALIVE, 1); # Enable monitoring of
+	                               # connection liveness.
+
+    #
+    #  Figure out who we're talking to so we can record the peer in 
+    #  the pid hash.
+    #
+    my $caller = getpeername($client);
+    my ($port,$iaddr);
+    if (defined($caller) && length($caller) > 0) {
+	($port,$iaddr)=unpack_sockaddr_in($caller);
+    } else {
+	&logthis("Unable to determine who caller was, getpeername returned nothing");
+    }
+    if (defined($iaddr)) {
+	$clientip  = inet_ntoa($iaddr);
+	Debug("Connected with $clientip");
+	$clientdns = gethostbyaddr($iaddr, AF_INET);
+	Debug("Connected with $clientdns by name");
+    } else {
+	&logthis("Unable to determine clientip");
+	$clientip='Unavailable';
+    }
     
     if ($pid) {
         # Parent records the child's birth and returns.
         sigprocmask(SIG_UNBLOCK, $sigset)
             or die "Can't unblock SIGINT for fork: $!\n";
-        $children{$pid} = 1;
-        $children++;
+        $children{$pid} = $clientip;
         &status('Started child '.$pid);
         return;
     } else {
@@ -668,1270 +3834,172 @@ sub make_new_child {
         sigprocmask(SIG_UNBLOCK, $sigset)
             or die "Can't unblock SIGINT for fork: $!\n";
 
-        my $tmpsnum=0;
+#        my $tmpsnum=0;            # Now global
 #---------------------------------------------------- kerberos 5 initialization
         &Authen::Krb5::init_context();
         &Authen::Krb5::init_ets();
 
-            &status('Accepted connection');
+	&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 ($port,$iaddr)=unpack_sockaddr_in($caller);
-            $clientip=inet_ntoa($iaddr);
-            my $clientrec=($hostid{$clientip} ne undef);
-            &logthis(
-"<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 =~ /^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) {
-		      $clientok=1;
-                      print $client "ok\n";
-                  } else {
-		      &logthis(
- "<font color=blue>WARNING: $clientip did not reply challenge</font>");
-                      &status('No challenge reply '.$clientip);
-                  }
-              } else {
-		  &logthis(
-                    "<font color=blue>WARNING: "
-                   ."$clientip failed to initialize: >$remotereq< </font>");
-                  &status('No init '.$clientip);
-              }
-	    } else {
-              &logthis(
- "<font color=blue>WARNING: Unknown client $clientip</font>");
-              &status('Hung up on '.$clientip);
-            }
-            if ($clientok) {
-# ---------------- New known client connecting, could mean machine online again
+	# see if we know client and 'check' for spoof IP by ineffective challenge
 
-		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");
+	ReadManagerTable;	# May also be a manager!!
+	
+	my $clientrec=($hostid{$clientip}     ne undef);
+	my $ismanager=($managers{$clientip}    ne undef);
+	$clientname  = "[unknonwn]";
+	if($clientrec) {	# Establish client type.
+	    $ConnectionType = "client";
+	    $clientname = $hostid{$clientip};
+	    if($ismanager) {
+		$ConnectionType = "both";
+	    }
+	} else {
+	    $ConnectionType = "manager";
+	    $clientname = $managers{$clientip};
+	}
+	my $clientok;
+
+	if ($clientrec || $ismanager) {
+	    &status("Waiting for init from $clientip $clientname");
+	    &logthis('<font color="yellow">INFO: Connection, '.
+		     $clientip.
+		  " ($clientname) connection type = $ConnectionType </font>" );
+	    &status("Connecting $clientip  ($clientname))"); 
+	    my $remotereq=<$client>;
+	    chomp($remotereq);
+	    Debug("Got init: $remotereq");
+	    my $inikeyword = split(/:/, $remotereq);
+	    if ($remotereq =~ /^init/) {
+		&sethost("sethost:$perlvar{'lonHostID'}");
+		#
+		#  If the remote is attempting a local init... give that a try:
+		#
+		my ($i, $inittype) = split(/:/, $remotereq);
+
+		# If the connection type is ssl, but I didn't get my
+		# certificate files yet, then I'll drop  back to 
+		# insecure (if allowed).
+		
+		if($inittype eq "ssl") {
+		    my ($ca, $cert) = lonssl::CertificateFile;
+		    my $kfile       = lonssl::KeyFile;
+		    if((!$ca)   || 
+		       (!$cert) || 
+		       (!$kfile)) {
+			$inittype = ""; # This forces insecure attempt.
+			&logthis("<font color=\"blue\"> Certificates not "
+				 ."installed -- trying insecure auth</font>");
+		    } else {	# SSL certificates are in place so
+		    }		# Leave the inittype alone.
 		}
-		&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) {
-                    my ($cmd,$cmdlength,$encinput)=split(/:/,$userinput);
-		    $userinput='';
-                    for (my $encidx=0;$encidx<length($encinput);$encidx+=16) {
-                       $userinput.=
-			   $cipher->decrypt(
-                            pack("H16",substr($encinput,$encidx,16))
-                           );
+
+		if($inittype eq "local") {
+		    my $key = LocalConnection($client, $remotereq);
+		    if($key) {
+			Debug("Got local key $key");
+			$clientok     = 1;
+			my $cipherkey = pack("H32", $key);
+			$cipher       = new IDEA($cipherkey);
+			print $client "ok:local\n";
+			&logthis('<font color="green"'
+				 . "Successful local authentication </font>");
+			$keymode = "local"
+		    } else {
+			Debug("Failed to get local key");
+			$clientok = 0;
+			shutdown($client, 3);
+			close $client;
+		    }
+		} elsif ($inittype eq "ssl") {
+		    my $key = SSLConnection($client);
+		    if ($key) {
+			$clientok = 1;
+			my $cipherkey = pack("H32", $key);
+			$cipher       = new IDEA($cipherkey);
+			&logthis('<font color="green">'
+				 ."Successfull ssl authentication with $clientname </font>");
+			$keymode = "ssl";
+	     
+		    } else {
+			$clientok = 0;
+			close $client;
+		    }
+	   
+		} else {
+		    my $ok = InsecureConnection($client);
+		    if($ok) {
+			$clientok = 1;
+			&logthis('<font color="green">'
+				 ."Successful insecure authentication with $clientname </font>");
+			print $client "ok\n";
+			$keymode = "insecure";
+		    } else {
+			&logthis('<font color="yellow">'
+				  ."Attempted insecure connection disallowed </font>");
+			close $client;
+			$clientok = 0;
+			
 		    }
-		    $userinput=substr($userinput,0,$cmdlength);
-                    $wasenc=1;
 		}
-	      }
-	  
-# ------------------------------------------------------------- Normal commands
-# ------------------------------------------------------------------------ ping
-		   if ($userinput =~ /^ping/) {
-                       print $client "$currenthostid\n";
-# ------------------------------------------------------------------------ pong
-		   }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=$currenthostid.$hostid{$clientip};
-                       $key=~tr/a-z/A-Z/;
-                       $key=~tr/G-P/0-9/;
-                       $key=~tr/Q-Z/0-9/;
-                       $key=$key.$buildkey.$key.$buildkey.$key.$buildkey;
-                       $key=substr($key,0,32);
-                       my $cipherkey=pack("H32",$key);
-                       $cipher=new IDEA $cipherkey;
-                       print $client "$buildkey\n"; 
-# ------------------------------------------------------------------------ load
-		   } elsif ($userinput =~ /^load/) {
-                       my $loadavg;
-                       {
-                          my $loadfile=IO::File->new('/proc/loadavg');
-                          $loadavg=<$loadfile>;
-                       }
-                       $loadavg =~ s/\s.*//g;
-		       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)) {
-			       print $client "ok\n";
-			   } else {
-			       print $client "refused\n";
-			   }
-		       } else {
-			   print $client "refused\n";
-		       }
-# ------------------------------------------------------------------------ auth
-                   } elsif ($userinput =~ /^auth/) {
-		     if ($wasenc==1) {
-                       my ($cmd,$udom,$uname,$upass)=split(/:/,$userinput);
-                       chomp($upass);
-                       $upass=unescape($upass);
-                       my $proname=propath($udom,$uname);
-                       my $passfilename="$proname/passwd";
-                       if (-e $passfilename) {
-                          my $pf = IO::File->new($passfilename);
-                          my $realpasswd=<$pf>;
-                          chomp($realpasswd);
-                          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') {
-			      &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') {
-                              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 {
-                             print $client "non_authorized\n";
-                          }  
-		       } else {
-                          print $client "unknown_user\n";
-                       }
-		     } else {
-		       print $client "refused\n";
-		     }
-# ---------------------------------------------------------------------- passwd
-                   } elsif ($userinput =~ /^passwd/) {
-		     if ($wasenc==1) {
-                       my 
-                       ($cmd,$udom,$uname,$upass,$npass)=split(/:/,$userinput);
-                       chomp($npass);
-                       $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;
-                          { my $pf = IO::File->new($passfilename);
-			    $realpasswd=<$pf>; }
-                          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;
-				 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";
-                           }
-                          } 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 {
-                          print $client "unknown_user\n";
-                       }
-		     } 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);
-                       chomp($uname);
-                       my $proname=propath($udom,$uname);
-                       if (-e $proname) {
-                          print $client "found\n";
-                       } else {
-			  print $client "not_found\n";
-                       }
-# ---------------------------------------------------------------------- update
-                   } elsif ($userinput =~ /^update/) {
-                       my ($cmd,$fname)=split(/:/,$userinput);
-                       my $ownership=ishome($fname);
-                       if ($ownership eq 'not_owner') {
-                        if (-e $fname) {
-                          my ($dev,$ino,$mode,$nlink,
-                              $uid,$gid,$rdev,$size,
-                              $atime,$mtime,$ctime,
-                              $blksize,$blocks)=stat($fname);
-                          my $now=time;
-                          my $since=$now-$atime;
-                          if ($since>$perlvar{'lonExpire'}) {
-                              my $reply=
-                                    &reply("unsub:$fname","$hostid{$clientip}");
-                              unlink("$fname");
-                          } else {
-			     my $transname="$fname.in.transfer";
-                             my $remoteurl=
-                                    reply("sub:$fname","$hostid{$clientip}");
-                             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)");
-                             } else {
-	                         if ($remoteurl!~/\.meta$/) {
-                                  my $ua=new LWP::UserAgent;
-                                  my $mrequest=
-                                   new HTTP::Request('GET',$remoteurl.'.meta');
-                                  my $mresponse=
-                                   $ua->request($mrequest,$fname.'.meta');
-                                  if ($mresponse->is_error()) {
-		                    unlink($fname.'.meta');
-                                  }
-	                         }
-                                 rename($transname,$fname);
-			     }
-                          }
-                          print $client "ok\n";
-                        } else {
-                          print $client "not_found\n";
-                        }
-		       } 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) {
-			   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);
-		       print $client &currentversion($fname)."\n";
-# ------------------------------------------------------------------------- log
-                   } elsif ($userinput =~ /^log/) {
-                       my ($cmd,$udom,$uname,$what)=split(/:/,$userinput);
-                       chomp($what);
-                       my $proname=propath($udom,$uname);
-                       my $now=time;
-                       {
-			 my $hfh;
-			 if ($hfh=IO::File->new(">>$proname/activity.log")) { 
-                            print $hfh "$now:$hostid{$clientip}:$what\n";
-                            print $client "ok\n"; 
-			} else {
-                            print $client "error: ".($!+0)
-				." IO::File->new Failed "
-                                    ."while attempting log\n";
-		        }
-		       }
-# ------------------------------------------------------------------------- put
-                   } elsif ($userinput =~ /^put/) {
-                      my ($cmd,$udom,$uname,$namespace,$what)
-                          =split(/:/,$userinput);
-                      $namespace=~s/\//\_/g;
-                      $namespace=~s/\W//g;
-                      if ($namespace ne 'roles') {
-                       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);
-		       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: ".($!+0)
-				  ." untie(GDBM) failed ".
-                                      "while attempting put\n";
-                           }
-                       } else {
-                           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);
-                       my $now=time;
-                       {
-			   my $hfh;
-			   if (
-                             $hfh=IO::File->new(">>$proname/$namespace.hist")
-			       ) { 
-                                  print $hfh "P:$now:$exedom:$exeuser:$what\n";
-                                 }
-		       }
-                       my @pairs=split(/\&/,$what);
-		       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: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting rolesput\n";
-                           }
-                       } else {
-                           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";
-                      }
-# ------------------------------------------------------------------------- get
-                   } elsif ($userinput =~ /^get/) {
-                       my ($cmd,$udom,$uname,$namespace,$what)
-                          =split(/:/,$userinput);
-                       $namespace=~s/\//\_/g;
-                       $namespace=~s/\W//g;
-                       chomp($what);
-                       my @queries=split(/\&/,$what);
-                       my $proname=propath($udom,$uname);
-                       my $qresult='';
-		       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: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting get\n";
-                           }
-                       } else {
-                           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/) {
-                       my ($cmd,$udom,$uname,$namespace,$what)
-                          =split(/:/,$userinput);
-                       $namespace=~s/\//\_/g;
-                       $namespace=~s/\W//g;
-                       chomp($what);
-                       my @queries=split(/\&/,$what);
-                       my $proname=propath($udom,$uname);
-                       my $qresult='';
-		       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/\&$//;
-                              if ($cipher) {
-                                my $cmdlength=length($qresult);
-                                $qresult.="         ";
-                                my $encqresult='';
-                                for 
-				(my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
-                                 $encqresult.=
-                                 unpack("H16",
-                                 $cipher->encrypt(substr($qresult,$encidx,8)));
-                                }
-                                print $client "enc:$cmdlength:$encqresult\n";
-			      } else {
-			        print $client "error:no_key\n";
-                              }
-                           } else {
-                              print $client "error: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting eget\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                   "while attempting eget\n";
-                       }
-# ------------------------------------------------------------------------- del
-                   } elsif ($userinput =~ /^del/) {
-                       my ($cmd,$udom,$uname,$namespace,$what)
-                          =split(/:/,$userinput);
-                       $namespace=~s/\//\_/g;
-                       $namespace=~s/\W//g;
-                       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);
-		       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: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting del\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                   "while attempting del\n";
-                       }
-# ------------------------------------------------------------------------ keys
-                   } elsif ($userinput =~ /^keys/) {
-                       my ($cmd,$udom,$uname,$namespace)
-                          =split(/:/,$userinput);
-                       $namespace=~s/\//\_/g;
-                       $namespace=~s/\W//g;
-                       my $proname=propath($udom,$uname);
-                       my $qresult='';
-		       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: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting keys\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                   "while attempting keys\n";
-                       }
-# ----------------------------------------------------------------- dumpcurrent
-                   } elsif ($userinput =~ /^currentdump/) {
-                       my ($cmd,$udom,$uname,$namespace)
-                          =split(/:/,$userinput);
-                       $namespace=~s/\//\_/g;
-                       $namespace=~s/\W//g;
-                       my $qresult='';
-                       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";
-                           }
-                       } 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: ".($!+0)
-				   ." untie(GDBM) Failed ".
-                                       "while attempting dump\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                      "while attempting dump\n";
-                       }
-# ----------------------------------------------------------------------- store
-                   } elsif ($userinput =~ /^store/) {
-                      my ($cmd,$udom,$uname,$namespace,$rid,$what)
-                          =split(/:/,$userinput);
-                      $namespace=~s/\//\_/g;
-                      $namespace=~s/\W//g;
-                      if ($namespace ne 'roles') {
-                       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);
-		       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 my $pair (@pairs) {
-			       my ($key,$value)=split(/=/,$pair);
-                               $allkeys.=$key.':';
-                               $hash{"$version:$rid:$key"}=$value;
-                           }
-                           $hash{"$version:$rid:timestamp"}=$now;
-                           $allkeys.='timestamp';
-                           $hash{"$version:keys:$rid"}=$allkeys;
-			   if (untie(%hash)) {
-                              print $client "ok\n";
-                           } else {
-                              print $client "error: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting store\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                   "while attempting store\n";
-                       }
-		      } else {
-                          print $client "refused\n";
-                      }
-# --------------------------------------------------------------------- restore
-                   } elsif ($userinput =~ /^restore/) {
-                       my ($cmd,$udom,$uname,$namespace,$rid)
-                          =split(/:/,$userinput);
-                       $namespace=~s/\//\_/g;
-                       $namespace=~s/\W//g;
-                       chomp($rid);
-                       my $proname=propath($udom,$uname);
-                       my $qresult='';
-		       my %hash;
-		       if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
-                	   my $version=$hash{"version:$rid"};
-                           $qresult.="version=$version&";
-                           my $scope;
-                           for ($scope=1;$scope<=$version;$scope++) {
-			      my $vkeys=$hash{"$scope:keys:$rid"};
-                              my @keys=split(/:/,$vkeys);
-                              my $key;
-                              $qresult.="$scope:keys=$vkeys&";
-                              foreach $key (@keys) {
-	     $qresult.="$scope:$key=".$hash{"$scope:$rid:$key"}."&";
-                              }                                  
-                           }
-			   if (untie(%hash)) {
-		              $qresult=~s/\&$//;
-                              print $client "$qresult\n";
-                           } else {
-                              print $client "error: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting restore\n";
-                           }
-                       } else {
-                           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,
-			   $arg1,$arg2,$arg3)=split(/\:/,$userinput);
-		       $query=~s/\n*$//g;
-		       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: ".($!+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);
-                       chomp($what);
-                       $udom=~s/\W//g;
-                       my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
-                       my $now=time;
-                       {
-			   my $hfh;
-			   if (
-                             $hfh=IO::File->new(">>$proname.hist")
-			       ) { print $hfh "P:$now:$what\n"; }
-		       }
-                       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;
-                           }
-			   if (untie(%hash)) {
-                              print $client "ok\n";
-                           } else {
-                              print $client "error: ".($!+0)
-				  ." untie(GDBM) Failed ".
-                                      "while attempting idput\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                      "while attempting idput\n";
-                       }
-# ----------------------------------------------------------------------- idget
-                   } elsif ($userinput =~ /^idget/) {
-                       my ($cmd,$udom,$what)=split(/:/,$userinput);
-                       chomp($what);
-                       $udom=~s/\W//g;
-                       my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
-                       my @queries=split(/\&/,$what);
-                       my $qresult='';
-		       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";
-                           } else {
-			       print $client "error: ".($!+0)
-				   ." untie(GDBM) Failed ".
-				       "while attempting idget\n";
-                           }
-                       } else {
-                           print $client "error: ".($!+0)
-			       ." tie(GDBM) Failed ".
-                                   "while attempting idget\n";
-                       }
-# ---------------------------------------------------------------------- tmpput
-                   } elsif ($userinput =~ /^tmpput/) {
-                       my ($cmd,$what)=split(/:/,$userinput);
-		       my $store;
-                       $tmpsnum++;
-                       my $id=$$.'_'.$clientip.'_'.$tmpsnum;
-                       $id=~s/\W/\_/g;
-                       $what=~s/\n//g;
-                       my $execdir=$perlvar{'lonDaemons'};
-                       if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
-			   print $store $what;
-			   close $store;
-			   print $client "$id\n";
-		       }
-		       else {
-			   print $client "error: ".($!+0)
-			       ."IO::File->new Failed ".
-                                   "while attempting tmpput\n";
-		       }
-
-# ---------------------------------------------------------------------- tmpget
-                   } elsif ($userinput =~ /^tmpget/) {
-                       my ($cmd,$id)=split(/:/,$userinput);
-                       chomp($id);
-                       $id=~s/\W/\_/g;
-                       my $store;
-                       my $execdir=$perlvar{'lonDaemons'};
-                       if ($store=IO::File->new("$execdir/tmp/$id.tmp")) {
-                           my $reply=<$store>;
-			   print $client "$reply\n";
-                           close $store;
-		       }
-		       else {
-			   print $client "error: ".($!+0)
-			       ."IO::File->new Failed ".
-                                   "while attempting tmpget\n";
-		       }
+	    } else {
+		&logthis(
+			 "<font color='blue'>WARNING: "
+			 ."$clientip failed to initialize: >$remotereq< </font>");
+		&status('No init '.$clientip);
+	    }
+	    
+	} else {
+	    &logthis(
+		     "<font color='blue'>WARNING: Unknown client $clientip</font>");
+	    &status('Hung up on '.$clientip);
+	}
+ 
+	if ($clientok) {
+# ---------------- New known client connecting, could mean machine online again
+	    
+	    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: $clientname</font>");
+	    &status('Will listen to '.$clientname);
+# ------------------------------------------------------------ Process requests
+	    my $keep_going = 1;
+	    my $user_input;
+	    while(($user_input = get_request) && $keep_going) {
+		alarm(120);
+		Debug("Main: Got $user_input\n");
+		$keep_going = &process_request($user_input);
+		alarm(0);
+		&status('Listening to '.$clientname." ($keymode)");	   
+	    }
 
-# ---------------------------------------------------------------------- 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) {
-                           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";
-                   }
-# -------------------------------------------------------------------- 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>");
-            }
-	}             
-
+	}  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>");    
-
-
-        # this exit is VERY important, otherwise the child will become
-        # a producer of more and more children, forking yourself into
-        # process death.
-        exit;
+    
+    &logthis("<font color='red'>CRITICAL: "
+	     ."Disconnect from $clientip ($clientname)</font>");    
+    
+    
+    # this exit is VERY important, otherwise the child will become
+    # a producer of more and more children, forking yourself into
+    # process death.
+    exit;
     
 }
 
@@ -1947,15 +4015,12 @@ sub make_new_child {
 #    user      - Name of the user for which the role is being put.
 #    authtype  - The authentication type associated with the user.
 #
-sub ManagePermissions
+sub manage_permissions
 {
-    my $request = shift;
-    my $domain  = shift;
-    my $user    = shift;
-    my $authtype= shift;
+
+    my ($request, $domain, $user, $authtype) = @_;
 
     # 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" ;
@@ -1963,17 +4028,89 @@ sub ManagePermissions
 	system("$execdir/lchtmldir $userhome $user $authtype");
     }
 }
+
+
+#
+#  Return the full path of a user password file, whether it exists or not.
+# Parameters:
+#   domain     - Domain in which the password file lives.
+#   user       - name of the user.
+# Returns:
+#    Full passwd path:
+#
+sub password_path {
+    my ($domain, $user) = @_;
+
+
+    my $path   = &propath($domain, $user);
+    $path  .= "/passwd";
+
+    return $path;
+}
+
+#   Password Filename
+#   Returns the path to a passwd file given domain and user... only if
+#  it exists.
+# Parameters:
+#   domain    - Domain in which to search.
+#   user      - username.
+# Returns:
+#   - If the password file exists returns its path.
+#   - If the password file does not exist, returns undefined.
+#
+sub password_filename {
+    my ($domain, $user) = @_;
+
+    Debug ("PasswordFilename called: dom = $domain user = $user");
+
+    my $path  = &password_path($domain, $user);
+    Debug("PasswordFilename got path: $path");
+    if(-e $path) {
+	return $path;
+    } else {
+	return undef;
+    }
+}
+
+#
+#   Rewrite the contents of the user's passwd file.
+#  Parameters:
+#    domain    - domain of the user.
+#    name      - User's name.
+#    contents  - New contents of the file.
+# Returns:
+#   0    - Failed.
+#   1    - Success.
 #
-#   GetAuthType - Determines the authorization type of a user in a domain.
+sub rewrite_password_file {
+    my ($domain, $user, $contents) = @_;
+
+    my $file = &password_filename($domain, $user);
+    if (defined $file) {
+	my $pf = IO::File->new(">$file");
+	if($pf) {
+	    print $pf "$contents\n";
+	    return 1;
+	} else {
+	    return 0;
+	}
+    } else {
+	return 0;
+    }
+
+}
+
+#
+#   get_auth_type - Determines the authorization type of a user in a domain.
 
 #     Returns the authorization type or nouser if there is no such user.
 #
-sub GetAuthType 
+sub get_auth_type 
 {
-    my $domain = shift;
-    my $user   = shift;
 
-    Debug("GetAuthType( $domain, $user ) \n");
+    my ($domain, $user)  = @_;
+
+    Debug("get_auth_type( $domain, $user ) \n");
     my $proname    = &propath($domain, $user); 
     my $passwdfile = "$proname/passwd";
     if( -e $passwdfile ) {
@@ -1989,13 +4126,132 @@ sub GetAuthType
 	}
 
 	return "$authtype:$availinfo";
-    }
-    else {
+    } else {
 	Debug("Returning nouser");
 	return "nouser";
     }
 }
 
+#
+#  Validate a user given their domain, name and password.  This utility
+#  function is used by both  AuthenticateHandler and ChangePasswordHandler
+#  to validate the login credentials of a user.
+# Parameters:
+#    $domain    - The domain being logged into (this is required due to
+#                 the capability for multihomed systems.
+#    $user      - The name of the user being validated.
+#    $password  - The user's propoposed password.
+#
+# Returns:
+#     1        - The domain,user,pasword triplet corresponds to a valid
+#                user.
+#     0        - The domain,user,password triplet is not a valid user.
+#
+sub validate_user {
+    my ($domain, $user, $password) = @_;
+
+
+    # Why negative ~pi you may well ask?  Well this function is about
+    # authentication, and therefore very important to get right.
+    # I've initialized the flag that determines whether or not I've 
+    # validated correctly to a value it's not supposed to get.
+    # At the end of this function. I'll ensure that it's not still that
+    # value so we don't just wind up returning some accidental value
+    # as a result of executing an unforseen code path that
+    # did not set $validated.
+
+    my $validated = -3.14159;
+
+    #  How we authenticate is determined by the type of authentication
+    #  the user has been assigned.  If the authentication type is
+    #  "nouser", the user does not exist so we will return 0.
+
+    my $contents = &get_auth_type($domain, $user);
+    my ($howpwd, $contentpwd) = split(/:/, $contents);
+
+    my $null = pack("C",0);	# Used by kerberos auth types.
+
+    if ($howpwd ne 'nouser') {
+
+	if($howpwd eq "internal") { # Encrypted is in local password file.
+	    $validated = (crypt($password, $contentpwd) eq $contentpwd);
+	}
+	elsif ($howpwd eq "unix") { # User is a normal unix user.
+	    $contentpwd = (getpwnam($user))[1];
+	    if($contentpwd) {
+		if($contentpwd eq 'x') { # Shadow password file...
+		    my $pwauth_path = "/usr/local/sbin/pwauth";
+		    open PWAUTH,  "|$pwauth_path" or
+			die "Cannot invoke authentication";
+		    print PWAUTH "$user\n$password\n";
+		    close PWAUTH;
+		    $validated = ! $?;
+
+		} else { 	         # Passwords in /etc/passwd. 
+		    $validated = (crypt($password,
+					$contentpwd) eq $contentpwd);
+		}
+	    } else {
+		$validated = 0;
+	    }
+	}
+	elsif ($howpwd eq "krb4") { # user is in kerberos 4 auth. domain.
+	    if(! ($password =~ /$null/) ) {
+		my $k4error = &Authen::Krb4::get_pw_in_tkt($user,
+							   "",
+							   $contentpwd,,
+							   'krbtgt',
+							   $contentpwd,
+							   1,
+							   $password);
+		if(!$k4error) {
+		    $validated = 1;
+		} else {
+		    $validated = 0;
+		    &logthis('krb4: '.$user.', '.$contentpwd.', '.
+			     &Authen::Krb4::get_err_txt($Authen::Krb4::error));
+		}
+	    } else {
+		$validated = 0; # Password has a match with null.
+	    }
+	} elsif ($howpwd eq "krb5") { # User is in kerberos 5 auth. domain.
+	    if(!($password =~ /$null/)) { # Null password not allowed.
+		my $krbclient = &Authen::Krb5::parse_name($user.'@'
+							  .$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,
+									 $password,
+									 $credentials);
+		$validated = ($krbreturn == 1);
+	    } else {
+		$validated = 0;
+	    }
+	} elsif ($howpwd eq "localauth") { 
+	    #  Authenticate via installation specific authentcation method:
+	    $validated = &localauth::localauth($user, 
+					       $password, 
+					       $contentpwd);
+	} else {			# Unrecognized auth is also bad.
+	    $validated = 0;
+	}
+    } else {
+	$validated = 0;
+    }
+    #
+    #  $validated has the correct stat of the authentication:
+    #
+
+    unless ($validated != -3.14159) {
+	die "ValidateUser - failed to set the value of validated";
+    }
+    return $validated;
+}
+
+
 sub addline {
     my ($fname,$hostid,$ip,$newline)=@_;
     my $contents;
@@ -2080,17 +4336,36 @@ sub chatadd {
 sub unsub {
     my ($fname,$clientip)=@_;
     my $result;
-    if (unlink("$fname.$hostid{$clientip}")) {
-	$result="ok\n";
-    } else {
-	$result="not_subscribed\n";
-    }
+    my $unsubs = 0;		# Number of successful unsubscribes:
+
+
+    # An old way subscriptions were handled was to have a 
+    # subscription marker file:
+
+    Debug("Attempting unlink of $fname.$clientname");
+    if (unlink("$fname.$clientname")) {
+	$unsubs++;		# Successful unsub via marker file.
+    } 
+
+    # The more modern way to do it is to have a subscription list
+    # file:
+
     if (-e "$fname.subscription") {
-	my $found=&addline($fname,$hostid{$clientip},$clientip,'');
-	if ($found) { $result="ok\n"; }
+	my $found=&addline($fname,$clientname,$clientip,'');
+	if ($found) { 
+	    $unsubs++;
+	}
+    } 
+
+    #  If either or both of these mechanisms succeeded in unsubscribing a 
+    #  resource we can return ok:
+
+    if($unsubs) {
+	$result = "ok\n";
     } else {
-	if ($result != "ok\n") { $result="not_subscribed\n"; }
+	$result = "not_subscribed\n";
     }
+
     return $result;
 }
 
@@ -2118,7 +4393,7 @@ sub currentversion {
 # 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 ($thisfile=~/\Q$fnamere1\E(\d+)\Q$fnamere2\E$/) {
 			    if ($1>$version) { $version=$1; }
 			}
 		    }
@@ -2166,10 +4441,10 @@ sub subscribe {
 	    if (-d $fname) {
 		$result="directory\n";
 	    } else {
-		if (-e "$fname.$hostid{$clientip}") {&unsub($fname,$clientip);}
+		if (-e "$fname.$clientname") {&unsub($fname,$clientip);}
 		my $now=time;
-		my $found=&addline($fname,$hostid{$clientip},$clientip,
-				   "$hostid{$clientip}:$clientip:$now\n");
+		my $found=&addline($fname,$clientname,$clientip,
+				   "$clientname:$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
@@ -2212,7 +4487,19 @@ sub make_passwd_file {
 	}
     } elsif ($umode eq 'unix') {
 	{
-	    my $execpath="$perlvar{'lonDaemons'}/"."lcuseradd";
+	    #
+	    #  Don't allow the creation of privileged accounts!!! that would
+	    #  be real bad!!!
+	    #
+	    my $uid = getpwnam($uname);
+	    if((defined $uid) && ($uid == 0)) {
+		&logthis(">>>Attempted to create privilged account blocked");
+		return "no_priv_account_error\n";
+	    }
+
+	    my $execpath       ="$perlvar{'lonDaemons'}/"."lcuseradd";
+
+	    my $lc_error_file  = $execdir."/tmp/lcuseradd".$$.".status";
 	    {
 		&Debug("Executing external: ".$execpath);
 		&Debug("user  = ".$uname.", Password =". $npass);
@@ -2220,17 +4507,27 @@ sub make_passwd_file {
 		print $se "$uname\n";
 		print $se "$npass\n";
 		print $se "$npass\n";
+		print $se "$lc_error_file\n"; # Status -> unique file.
 	    }
-	    my $useraddok = $?;
+	    my $error = IO::File->new("< $lc_error_file");
+	    my $useraddok = <$error>;
+	    $error->close;
+	    unlink($lc_error_file);
+
+	    chomp $useraddok;
+
 	    if($useraddok > 0) {
-		&logthis("Failed lcuseradd: ".&lcuseraddstrerror($useraddok));
+		my $error_text = &lcuseraddstrerror($useraddok);
+		&logthis("Failed lcuseradd: $error_text");
+		$result = "lcuseradd_failed:$error_text\n";
+	    }  else {
+		my $pf = IO::File->new(">$passfilename");
+		print $pf "unix:\n";
 	    }
-	    my $pf = IO::File->new(">$passfilename");
-	    print $pf "unix:\n";
 	}
     } elsif ($umode eq 'none') {
 	{
-	    my $pf = IO::File->new(">$passfilename");
+	    my $pf = IO::File->new("> $passfilename");
 	    print $pf "none:\n";
 	}
     } else {
@@ -2244,7 +4541,7 @@ sub sethost {
     my (undef,$hostid)=split(/:/,$remotereq);
     if (!defined($hostid)) { $hostid=$perlvar{'lonHostID'}; }
     if ($hostip{$perlvar{'lonHostID'}} eq $hostip{$hostid}) {
-	$currenthostid=$hostid;
+	$currenthostid  =$hostid;
 	$currentdomainid=$hostdom{$hostid};
 	&logthis("Setting hostid to $hostid, and domain to $currentdomainid");
     } else {
@@ -2271,7 +4568,7 @@ sub userload {
 	while ($filename=readdir(LONIDS)) {
 	    if ($filename eq '.' || $filename eq '..') {next;}
 	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
-	    if ($curtime-$mtime < 3600) { $numusers++; }
+	    if ($curtime-$mtime < 1800) { $numusers++; }
 	}
 	closedir(LONIDS);
     }
@@ -2284,6 +4581,74 @@ sub userload {
     return $userloadpercent;
 }
 
+# Routines for serializing arrays and hashes (copies from lonnet)
+
+sub array2str {
+  my (@array) = @_;
+  my $result=&arrayref2str(\@array);
+  $result=~s/^__ARRAY_REF__//;
+  $result=~s/__END_ARRAY_REF__$//;
+  return $result;
+}
+                                                                                 
+sub arrayref2str {
+  my ($arrayref) = @_;
+  my $result='__ARRAY_REF__';
+  foreach my $elem (@$arrayref) {
+    if(ref($elem) eq 'ARRAY') {
+      $result.=&arrayref2str($elem).'&';
+    } elsif(ref($elem) eq 'HASH') {
+      $result.=&hashref2str($elem).'&';
+    } elsif(ref($elem)) {
+      #print("Got a ref of ".(ref($elem))." skipping.");
+    } else {
+      $result.=&escape($elem).'&';
+    }
+  }
+  $result=~s/\&$//;
+  $result .= '__END_ARRAY_REF__';
+  return $result;
+}
+                                                                                 
+sub hash2str {
+  my (%hash) = @_;
+  my $result=&hashref2str(\%hash);
+  $result=~s/^__HASH_REF__//;
+  $result=~s/__END_HASH_REF__$//;
+  return $result;
+}
+                                                                                 
+sub hashref2str {
+  my ($hashref)=@_;
+  my $result='__HASH_REF__';
+  foreach (sort(keys(%$hashref))) {
+    if (ref($_) eq 'ARRAY') {
+      $result.=&arrayref2str($_).'=';
+    } elsif (ref($_) eq 'HASH') {
+      $result.=&hashref2str($_).'=';
+    } elsif (ref($_)) {
+      $result.='=';
+      #print("Got a ref of ".(ref($_))." skipping.");
+    } else {
+        if ($_) {$result.=&escape($_).'=';} else { last; }
+    }
+
+    if(ref($hashref->{$_}) eq 'ARRAY') {
+      $result.=&arrayref2str($hashref->{$_}).'&';
+    } elsif(ref($hashref->{$_}) eq 'HASH') {
+      $result.=&hashref2str($hashref->{$_}).'&';
+    } elsif(ref($hashref->{$_})) {
+       $result.='&';
+      #print("Got a ref of ".(ref($hashref->{$_}))." skipping.");
+    } else {
+      $result.=&escape($hashref->{$_}).'&';
+    }
+  }
+  $result=~s/\&$//;
+  $result .= '__END_HASH_REF__';
+  return $result;
+}
+
 # ----------------------------------- POD (plain old documentation, CPAN style)
 
 =head1 NAME
@@ -2393,6 +4758,17 @@ each connection is logged.
 
 =item *
 
+SIGUSR2
+
+Parent Signal assignment:
+    $SIG{USR2} = \&UpdateHosts
+
+Child signal assignment:
+    NONE
+
+
+=item *
+
 SIGCHLD
 
 Parent signal assignment:
@@ -2480,7 +4856,7 @@ Place in B<logs/lond.log>
 
 stores hash in namespace
 
-=item rolesput
+=item rolesputy
 
 put a role into a user's environment