--- loncom/lond	2003/08/12 19:46:04	1.136
+++ loncom/lond	2004/06/17 22:37:52	1.198
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.136 2003/08/12 19:46:04 www Exp $
+# $Id: lond,v 1.198 2004/06/17 22:37:52 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,40 +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
-###
 
 use strict;
 use lib '/home/httpd/lib/perl/';
@@ -75,24 +45,49 @@ 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;
 
-my $DEBUG = 0;		       # Non zero to enable debug log entries.
+my $DEBUG = 11;		       # Non zero to enable debug log entries.
 
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.136 $'; #' stupid emacs
+my $VERSION='$Revision: 1.198 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
 
 my $client;
+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 %hostid;
-my %hostdom;
-my %hostip;
+my $keymode;
+
+# 
+#   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 %perlvar;			# Will have the apache conf defined perl vars.
 
 #
 #  The array below are password error strings."
@@ -122,16 +117,789 @@ 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");
 
 
+#------------------------------------------------------------------------
+#
+#   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
+#   request.  Note that at this point, the only concept of a certificate
+#   is the hostname to which we are connected.
+#
+#   Parameter:
+#      request   - The request sent by our client (this parameterization may
+#                  need to change when we really use a certificate granting
+#                  authority.
+#
+sub GetCertificate {
+    my $request = shift;
+
+    return $clientip;
+}
+
+#
+#   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.
+         logthis('<font color="green"> Skipping line: '. "$host</font>\n");
+         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.
+#                in this primitive implementation, the 'certificate' is
+#                just the connecting loncapa client name.  This is checked
+#                against a valid client list in the configuration.
+#
+#                  
+sub ValidManager {
+    my $certificate = shift; 
+
+    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 {
+	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>
+#              - Separate the contents of the new file out from the
+#                rest of the request.
+#              - Write the new file.
+#  Parameter:
+#     Request - The entire user request.  This consists of a : separated
+#               string pushfile:tablename:contents.
+#     NOTE:  The contents may have :'s in it as well making things a bit
+#            more interesting... but not much.
+#  Returns:
+#     String to send to client ("ok" or "refused" if bad file).
+#
+sub PushFile {
+    my $request = shift;    
+    my ($command, $filename, $contents) = split(":", $request, 3);
+    
+    #  At this point in time, pushes for only the following tables are
+    #  supported:
+    #   hosts.tab  ($filename eq host).
+    #   domain.tab ($filename eq domain).
+    # Construct the destination filename or reject the request.
+    #
+    # lonManage is supposed to ensure this, however this session could be
+    # part of some elaborate spoof that managed somehow to authenticate.
+    #
+
+
+    my $tablefile = ConfigFileFromSelector($filename);
+    if(! (defined $tablefile)) {
+	return "refused";
+    }
+    #
+    # >copy< the old table to the backup table
+    #        don't rename in case system crashes/reboots etc. in the time
+    #        window between a rename and write.
+    #
+    my $backupfile = $tablefile;
+    $backupfile    =~ s/\.tab$/.old/;
+    if(!CopyFile($tablefile, $backupfile)) {
+	&logthis('<font color="green"> CopyFile from '.$tablefile." to ".$backupfile." failed </font>");
+	return "error:$!";
+    }
+    &logthis('<font color="green"> Pushfile: backed up '
+	    .$tablefile." to $backupfile</font>");
+    
+    #  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:
+
+    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";
+}
 #
 #  Convert an error return code from lcpasswd to a string value.
 #
@@ -161,7 +929,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);
@@ -171,7 +940,8 @@ sub catchexception {
 }
 
 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
@@ -182,7 +952,7 @@ $SIG{__DIE__}=\&catchexception;
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf
 &status("Read loncapa.conf and loncapa_apache.conf");
 my $perlvarref=LONCAPA::Configuration::read_conf('loncapa.conf');
-my %perlvar=%{$perlvarref};
+%perlvar=%{$perlvarref};
 undef $perlvarref;
 
 # ----------------------------- Make sure this process is running from user=www
@@ -208,17 +978,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'},
@@ -233,41 +993,154 @@ $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');
@@ -282,6 +1155,7 @@ sub checkchildren {
     sleep 5;
     $SIG{ALRM} = sub { die "timeout" };
     $SIG{__DIE__} = 'DEFAULT';
+    &status("Checking on the children (waiting for reports)");
     foreach (sort keys %children) {
         unless (-e "$docdir/lon-status/londchld/$_.txt") {
           eval {
@@ -298,7 +1172,8 @@ sub checkchildren {
         }
     }
     $SIG{ALRM} = 'DEFAULT';
-    $SIG{__DIE__} = \&cathcexception;
+    $SIG{__DIE__} = \&catchexception;
+    &status("Finished checking children");
 }
 
 # --------------------------------------------------------------------- Logging
@@ -320,20 +1195,41 @@ 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");
+
+}
 # ------------------------------------------------------------------ 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";
+    print $fh $$."\t".$clientname."\t".$currenthostid."\t"
+	.$status."\t".$lastlog."\t $keymode\n";
     $fh->close();
     }
+    &status("Finished londstatus.txt");
     {
 	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 logging");
 }
 
 sub initnewstatus {
@@ -389,11 +1285,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>');
     }
 }
 
@@ -497,7 +1393,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');
 
 
@@ -509,8 +1405,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
@@ -518,8 +1417,11 @@ $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 {
@@ -528,21 +1430,45 @@ sub make_new_child {
     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";
 
-    my $clientip;
     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 {
@@ -564,1228 +1490,1737 @@ sub make_new_child {
         &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
+
+	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;
 
-		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;
+	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.
+		}
+
+		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;
 		    }
-		    &reconlonc("$perlvar{'lonSockDir'}/$id");
+	   
+		} 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;
+			
+		    }
+		}
+	    } 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;
 		}
-		&logthis("<font color=green>Established connection: $hostid{$clientip}</font>");
-              &status('Will listen to '.$hostid{$clientip});
+		&reconlonc("$perlvar{'lonSockDir'}/$id");
+	    }
+	    &logthis("<font color='green'>Established connection: $clientname</font>");
+	    &status('Will listen to '.$clientname);
 # ------------------------------------------------------------ Process requests
-              while (my $userinput=<$client>) {
+	    while (my $userinput=<$client>) {
                 chomp($userinput);
 		Debug("Request = $userinput\n");
-                &status('Processing '.$hostid{$clientip}.': '.$userinput);
+                &status('Processing '.$clientname.': '.$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 ($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))
+						 );
+			}
+			$userinput=substr($userinput,0,$cmdlength);
+			$wasenc=1;
 		    }
-		    $userinput=substr($userinput,0,$cmdlength);
-                    $wasenc=1;
 		}
-	      }
-	  
+		
 # ------------------------------------------------------------- Normal commands
 # ------------------------------------------------------------------------ ping
-		   if ($userinput =~ /^ping/) {
-                       print $client "$currenthostid\n";
+		if ($userinput =~ /^ping/) {	# client only
+		    if(isClient) {
+			print $client "$currenthostid\n";
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		    }
 # ------------------------------------------------------------------------ pong
-		   } elsif ($userinput =~ /^pong/) {
-                       my $reply=&reply("ping",$hostid{$clientip});
-                       print $client "$currenthostid:$reply\n"; 
+		}elsif ($userinput =~ /^pong/) { # client only
+		    if(isClient) {
+			my $reply=&reply("ping",$clientname);
+			print $client "$currenthostid:$reply\n"; 
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		    }
 # ------------------------------------------------------------------------ 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"; 
+		} elsif ($userinput =~ /^ekey/) { # ok for both clients & mgrs
+		    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;
+		    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";
+		} elsif ($userinput =~ /^load/) { # client only
+		    if (isClient) {
+			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";
+		    } else {
+			Reply($client, "refused\n", $userinput);
+	       
+		    }
 # -------------------------------------------------------------------- userload
-		   } elsif ($userinput =~ /^userload/) {
-		       my $userloadpercent=&userload();
-		       print $client "$userloadpercent\n";
+		} elsif ($userinput =~ /^userload/) { # client only
+		    if(isClient) {
+			my $userloadpercent=&userload();
+			print $client "$userloadpercent\n";
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		     
+		    }
+#
+#        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";
-		     }
+		} elsif ($userinput =~ /^currentauth/) {
+		    if (($wasenc==1)  && isClient) { # Encoded & client only.
+			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 {
+			Reply($client, "refused\n", $userinput);
+			
+		    }
+#--------------------------------------------------------------------- pushfile
+		} elsif($userinput =~ /^pushfile/) {	# encoded & manager.
+		    if(($wasenc == 1) && isManager) {
+			my $cert = GetCertificate($userinput);
+			if(ValidManager($cert)) {
+			    my $reply = PushFile($userinput);
+			    print $client "$reply\n";
+			} else {
+			    print $client "refused\n";
+			} 
+		    } else {
+			Reply($client, "refused\n", $userinput);
+			
+		    }
+#--------------------------------------------------------------------- reinit
+		} elsif($userinput =~ /^reinit/) { # Encoded and manager
+			if (($wasenc == 1) && isManager) {
+				my $cert = GetCertificate($userinput);
+				if(ValidManager($cert)) {
+					chomp($userinput);
+					my $reply = ReinitProcess($userinput);
+					print $client  "$reply\n";
+				} else {
+					 print $client "refused\n";
+				}
+			} else {
+				Reply($client, "refused\n", $userinput);
+			}
+#------------------------------------------------------------------------- edit
+		    } elsif ($userinput =~ /^edit/) {    # encoded and manager:
+			if(($wasenc ==1) && (isManager)) {
+			    my $cert = GetCertificate($userinput);
+			    if(ValidManager($cert)) {
+               my($command, $filetype, $script) = split(/:/, $userinput);
+               if (($filetype eq "hosts") || ($filetype eq "domain")) {
+                  if($script ne "") {
+		      Reply($client, EditFile($userinput));
+                  } else {
+                     Reply($client,"refused\n",$userinput);
+                  }
+               } else {
+                  Reply($client,"refused\n",$userinput);
+               }
+            } else {
+               Reply($client,"refused\n",$userinput);
+            }
+         } else {
+	     Reply($client,"refused\n",$userinput);
+	 }
 # ------------------------------------------------------------------------ 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);
+		    } elsif ($userinput =~ /^auth/) { # Encoded and client only.
+		    if (($wasenc==1) && isClient) {
+			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.','.
+						     &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";
-		     }
+				    $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 {
+			Reply($client, "refused\n", $userinput);
+		       
+		    }
 # ---------------------------------------------------------------------- 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 = IO::File->new(">$passfilename");
- 	  		       print $pf "internal:$ncpass\n"; }             
-			     &logthis("Result of password change for $uname: pwchange_success");
-                             print $client "ok\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";
-		     }
+		} elsif ($userinput =~ /^passwd/) { # encoded and client
+		    if (($wasenc==1) && isClient) {
+			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 {
+			Reply($client, "refused\n", $userinput);
+		       
+		    }
 # -------------------------------------------------------------------- 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);
+		} elsif ($userinput =~ /^makeuser/) { # encoded and client.
+		    &Debug("Make user received");
+		    my $oldumask=umask(0077);
+		    if (($wasenc==1) && isClient) {
+			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";
+				    }
+				}
+			    }
+			    unless ($fperror) {
+				my $result=&make_passwd_file($uname, $umode,$npass,
+							     $passfilename);
+				print $client $result;
+			    } else {
+				print $client "$fperror\n";
+			    }
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+	      
+		    }
+		    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";
-		     }
+		} elsif ($userinput =~ /^changeuserauth/) { # encoded & client
+		    &Debug("Changing authorization");
+		    if (($wasenc==1) && isClient) {
+			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 {
+			Reply($client, "refused\n", $userinput);
+		   
+		    }
 # ------------------------------------------------------------------------ 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";
-                       }
+		} elsif ($userinput =~ /^home/) { # client clear or encoded
+		    if(isClient) {
+			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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # ---------------------------------------------------------------------- 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";
-                       }
+		} elsif ($userinput =~ /^update/) { # client clear or encoded.
+		    if(isClient) {
+			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","$clientname");
+				    unlink("$fname");
+				} else {
+				    my $transname="$fname.in.transfer";
+				    my $remoteurl=
+					&reply("sub:$fname","$clientname");
+				    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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # -------------------------------------- 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";
-                     } 
+		} elsif ($userinput =~ /^fetchuserfile/) { # Client clear or enc.
+		    if(isClient) {
+			my ($cmd,$fname)=split(/:/,$userinput);
+			my ($udom,$uname,$ufile) = ($fname =~ m|^([^/]+)/([^/]+)/(.+)$|);
+			my $udir=propath($udom,$uname).'/userfiles';
+			unless (-e $udir) { mkdir($udir,0770); }
+			if (-e $udir) {
+                            $ufile=~s/^[\.\~]+//;
+                            my $path = $udir;
+                            if ($ufile =~m|(.+)/([^/]+)$|) {
+                                my @parts=split('/',$1);
+                                foreach my $part (@parts) {
+                                    $path .= '/'.$part;
+                                    if ((-e $path)!=1) {
+                                        mkdir($path,0770);
+                                    }
+                                }
+                            }
+			    my $destname=$udir.'/'.$ufile;
+			    my $transname=$udir.'/'.$ufile.'.in.transit';
+			    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 {
+				if (!rename($transname,$destname)) {
+				    &logthis("Unable to move $transname to $destname");
+				    unlink($transname);
+				    print $client "failed\n";
+				} else {
+				    print $client "ok\n";
+				}
+			    }
+			} else {
+			    print $client "not_home\n";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		    }
+# --------------------------------------------------------- remove a user file 
+		} elsif ($userinput =~ /^removeuserfile/) { # Client clear or enc.
+		    if(isClient) {
+			my ($cmd,$fname)=split(/:/,$userinput);
+			my ($udom,$uname,$ufile) = ($fname =~ m|^([^/]+)/([^/]+)/(.+)$|);
+			&logthis("$udom - $uname - $ufile");
+			if ($ufile =~m|/\.\./|) {
+			    # any files paths with /../ in them refuse 
+                            # to deal with
+			    print $client "refused\n";
+			} else {
+			    my $udir=propath($udom,$uname);
+			    if (-e $udir) {
+				my $file=$udir.'/userfiles/'.$ufile;
+				if (-e $file) {
+				    unlink($file);
+				    if (-e $file) {
+					print $client "failed\n";
+				    } else {
+					print $client "ok\n";
+				    }
+				} else {
+				    print $client "not_found\n";
+				}
+			    } else {
+				print $client "not_home\n";
+			    }
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		    }
 # ------------------------------------------ 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";
-                       }
+		} elsif ($userinput =~ /^tokenauthuserfile/) { # Client only
+		    if(isClient) {
+			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=~ m|userfile\.\Q$fname\E\=|) { $reply='ok'; }
+			    }
+			    close(ENVIN);
+			    print $client $reply."\n";
+			} else {
+			    print $client "invalid_token\n";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # ----------------------------------------------------------------- unsubscribe
-                   } elsif ($userinput =~ /^unsub/) {
-                       my ($cmd,$fname)=split(/:/,$userinput);
-                       if (-e $fname) {
-			   print $client &unsub($client,$fname,$clientip);
-                       } else {
-			   print $client "not_found\n";
-                       }
+		} elsif ($userinput =~ /^unsub/) {
+		    if(isClient) {
+			my ($cmd,$fname)=split(/:/,$userinput);
+			if (-e $fname) {
+			    print $client &unsub($fname,$clientip);
+			} else {
+			    print $client "not_found\n";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # ------------------------------------------------------------------- subscribe
-                   } elsif ($userinput =~ /^sub/) {
-		       print $client &subscribe($userinput,$clientip);
+		} elsif ($userinput =~ /^sub/) {
+		    if(isClient) {
+			print $client &subscribe($userinput,$clientip);
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # ------------------------------------------------------------- current version
-                   } elsif ($userinput =~ /^currentversion/) {
-                       my ($cmd,$fname)=split(/:/,$userinput);
-		       print $client &currentversion($fname)."\n";
+		} elsif ($userinput =~ /^currentversion/) {
+		    if(isClient) {
+			my ($cmd,$fname)=split(/:/,$userinput);
+			print $client &currentversion($fname)."\n";
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # ------------------------------------------------------------------------- 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";
-		        }
-		       }
+		} elsif ($userinput =~ /^log/) {
+		    if(isClient) {
+			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:$clientname:$what\n";
+				print $client "ok\n"; 
+			    } else {
+				print $client "error: ".($!+0)
+				    ." IO::File->new Failed "
+				    ."while attempting log\n";
+			    }
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # ------------------------------------------------------------------------- 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";
-                      }
+		} elsif ($userinput =~ /^put/) {
+		    if(isClient) {
+			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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
+# ------------------------------------------------------------------- inc
+		} elsif ($userinput =~ /^inc:/) {
+		    if(isClient) {
+			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);
+                                    # We could check that we have a number...
+                                    if (! defined($value) || $value eq '') {
+                                        $value = 1;
+                                    }
+				    $hash{$key}+=$value;
+				}
+				if (untie(%hash)) {
+				    print $client "ok\n";
+				} else {
+				    print $client "error: ".($!+0)
+					." untie(GDBM) failed ".
+					"while attempting inc\n";
+				}
+			    } else {
+				print $client "error: ".($!)
+				    ." tie(GDBM) Failed ".
+				    "while attempting inc\n";
+			    }
+			} else {
+			    print $client "refused\n";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+
+		    }
 # -------------------------------------------------------------------- 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";
-                      }
+		} elsif ($userinput =~ /^rolesput/) {
+		    if(isClient) {
+			&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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		  
+		    }
 # -------------------------------------------------------------------- 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";
-                      }
+		} elsif ($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 $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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		      
+		    }
 # ------------------------------------------------------------------------- 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";
-                           }
-                       }
+		} 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/) {
-                       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";
-                       }
+		} 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/) {
-                       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";
-                       }
+		} 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;
+			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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+			
+		    }
 # ------------------------------------------------------------------------ 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";
-                       }
+		} 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/) {
-                       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";
-                       }
+		} 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/) {
-                       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 ".
+		} 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 {
+			       print $client "error: ".($!+0)
+				   ." tie(GDBM) Failed ".
+				   "while attempting dump\n";
+			   }
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		 
+		    }
 # ----------------------------------------------------------------------- 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";
-                      }
+		} 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;
+			    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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		     
+		    }
 # --------------------------------------------------------------------- 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";
-                       }
+		} 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/) {
-                       my ($cmd,$cdom,$cnum,$newpost)=split(/\:/,$userinput);
-                       &chatadd($cdom,$cnum,$newpost);
-                       print $client "ok\n";
+		} 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/) {
-                       my 
-                        ($cmd,$cdom,$cnum,$udom,$uname)=split(/\:/,$userinput);
-                       my $reply='';
-                       foreach (&getchat($cdom,$cnum,$udom,$uname)) {
-			   $reply.=&escape($_).':';
-                       }
-                       $reply=~s/\:$//;
-                       print $client $reply."\n";
+		} 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/) {
-                       my ($cmd,$query,
-			   $arg1,$arg2,$arg3)=split(/\:/,$userinput);
-		       $query=~s/\n*$//g;
-		       print $client "".
-			       sqlreply("$hostid{$clientip}\&$query".
-					"\&$arg1"."\&$arg2"."\&$arg3")."\n";
+		} 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/) {
-                       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";
-		       }
+		} 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/) {
-                       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";
-                       }
+		} 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,$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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		       
+		    }
 # ---------------------------------------------------------------- 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";
-                       }
+		} 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)=split(/\:/,$value);
+				if ($lasttime<$since) { next; }
+				if ($description eq '.') {
+				    $qresult.=$key.'='.$descr.'&';
+				} else {
+				    my $unescapeVal = &unescape($descr);
+				    if (eval('$unescapeVal=~/\Q$description\E/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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		       
+		    }
 # ----------------------------------------------------------------------- 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";
-                       }
+		} 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 $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";
+			}
+		    } else {
+			Reply($client, "refused\n", $userinput);
+		       
+		    }
 # ----------------------------------------------------------------------- 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";
-                       }
+		} 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/) {
-                       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";
-		       }
-
+		} 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/) {
-                       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";
-		       }
-
+		} 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/) {
-                       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";
-		       }
+		} 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);
+		     
+		    }
 # -------------------------------------------------------------------------- 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";
+		} 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/) {
-		       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";
-		       }
+		} 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/)) {
-                       &logthis(
-      "Client $clientip ($hostid{$clientip}) hanging up: $userinput");
-                       print $client "bye\n";
-                       $client->close();
-		       last;
+		} 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();
+		    last;
+
+# ---------------------------------- 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";
+                    }
 # ------------------------------------------------------------- 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";
-                   }
+
+		} else {
+		    # unknown command
+		    print $client "unknown_cmd\n";
+		}
 # -------------------------------------------------------------------- complete
-		   alarm(0);
-                   &status('Listening to '.$hostid{$clientip});
-	       }
+		alarm(0);
+		&status('Listening to '.$clientname." ($keymode)");
+	    }
 # --------------------------------------------- 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;
     
 }
 
@@ -1803,13 +3238,10 @@ sub make_new_child {
 #
 sub ManagePermissions
 {
-    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" ;
@@ -1824,8 +3256,8 @@ sub ManagePermissions
 #
 sub GetAuthType 
 {
-    my $domain = shift;
-    my $user   = shift;
+
+    my ($domain, $user)  = @_;
 
     Debug("GetAuthType( $domain, $user ) \n");
     my $proname    = &propath($domain, $user); 
@@ -1900,10 +3332,10 @@ sub chatadd {
     my %hash;
     my $proname=&propath($cdom,$cname);
     my @entries=();
+    my $time=time;
     if (tie(%hash,'GDBM_File',"$proname/nohist_chatroom.db",
 	    &GDBM_WRCREAT(),0640)) {
 	@entries=map { $_.':'.$hash{$_} } sort keys %hash;
-	my $time=time;
 	my ($lastid)=($entries[$#entries]=~/^(\w+)\:/);
 	my ($thentime,$idnum)=split(/\_/,$lastid);
 	my $newid=$time.'_000000';
@@ -1923,22 +3355,47 @@ sub chatadd {
 	}
 	untie %hash;
     }
+    {
+	my $hfh;
+	if ($hfh=IO::File->new(">>$proname/chatroom.log")) { 
+	    print $hfh "$time:".&unescape($newchat)."\n";
+	}
+    }
 }
 
 sub unsub {
     my ($fname,$clientip)=@_;
     my $result;
-    if (unlink("$fname.$hostid{$clientip}")) {
-	$result="ok\n";
-    } else {
-	$result="not_subscribed\n";
-    }
+    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;
 }
 
@@ -1966,7 +3423,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; }
 			}
 		    }
@@ -2014,10 +3471,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
@@ -2060,6 +3517,16 @@ sub make_passwd_file {
 	}
     } elsif ($umode eq 'unix') {
 	{
+	    #
+	    #  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";
 	    {
 		&Debug("Executing external: ".$execpath);
@@ -2092,7 +3559,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 {
@@ -2118,8 +3585,8 @@ sub userload {
 	my $curtime=time;
 	while ($filename=readdir(LONIDS)) {
 	    if ($filename eq '.' || $filename eq '..') {next;}
-	    my ($atime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[8];
-	    if ($curtime-$atime < 3600) { $numusers++; }
+	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
+	    if ($curtime-$mtime < 1800) { $numusers++; }
 	}
 	closedir(LONIDS);
     }
@@ -2132,6 +3599,7 @@ sub userload {
     return $userloadpercent;
 }
 
+
 # ----------------------------------- POD (plain old documentation, CPAN style)
 
 =head1 NAME
@@ -2241,6 +3709,17 @@ each connection is logged.
 
 =item *
 
+SIGUSR2
+
+Parent Signal assignment:
+    $SIG{USR2} = \&UpdateHosts
+
+Child signal assignment:
+    NONE
+
+
+=item *
+
 SIGCHLD
 
 Parent signal assignment: