--- loncom/lond	2004/07/23 11:03:05	1.207
+++ loncom/lond	2004/08/06 10:27:53	1.224
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.207 2004/07/23 11:03:05 foxr Exp $
+# $Id: lond,v 1.224 2004/08/06 10:27:53 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,15 +50,16 @@ use File::Copy;
 use LONCAPA::ConfigFileEdit;
 use LONCAPA::lonlocal;
 use LONCAPA::lonssl;
+use Fcntl qw(:flock);
 
-my $DEBUG = 0;		       # Non zero to enable debug log entries.
+my $DEBUG = 1;		       # Non zero to enable debug log entries.
 
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.207 $'; #' stupid emacs
+my $VERSION='$Revision: 1.224 $'; #' stupid emacs
 my $remoteVERSION;
-my $currenthostid;
+my $currenthostid="default";
 my $currentdomainid;
 
 my $client;
@@ -121,8 +122,10 @@ my @passwderrors = ("ok",
 		   "lcpasswd Cannot set new passwd.",
 		   "lcpasswd Username has invalid characters",
 		   "lcpasswd Invalid characters in password",
-		    "11", "12",
-		    "lcpasswd Password mismatch");
+		   "lcpasswd User already exists", 
+                   "lcpasswd Something went wrong with user addition.",
+		    "lcpasswd Password mismatch",
+		    "lcpasswd Error filename is invalid");
 
 
 #  The array below are lcuseradd error strings.:
@@ -148,8 +151,8 @@ my @adderrors    = ("ok",
 #
 #   Statistics that are maintained and dislayed in the status line.
 #
-my $Transactions;		# Number of attempted transactions.
-my $Failures;			# Number of transcations failed.
+my $Transactions = 0;		# Number of attempted transactions.
+my $Failures     = 0;		# Number of transcations failed.
 
 #   ResetStatistics: 
 #      Resets the statistics counters:
@@ -191,8 +194,7 @@ sub LocalConnection {
 		 ."$clientdns ne $thisserver </font>");
 	close $Socket;
 	return undef;
-    } 
-    else {
+    }  else {
 	chomp($initcmd);	# Get rid of \n in filename.
 	my ($init, $type, $name) = split(/:/, $initcmd);
 	Debug(" Init command: $init $type $name ");
@@ -323,8 +325,7 @@ sub InsecureConnection {
     $answer    =~s/\W//g;
     if($challenge eq $answer) {
 	return 1;
-    } 
-    else {
+    } else {
 	logthis("<font color='blue'>WARNING client did not respond to challenge</font>");
 	&status("No challenge reqply");
 	return 0;
@@ -653,8 +654,7 @@ sub PushFile {
 	&logthis('<font color="red"> Pushfile: unable to install '
 	 .$tablefile." $! </font>");
 	return "error:$!";
-    }
-    else {
+    } else {
 	&logthis('<font color="green"> Installed new '.$tablefile
 		 ."</font>");
 
@@ -955,10 +955,8 @@ sub EditFile {
 #    Reference to a hash bound to the db file or alternatively undef
 #    if the tie failed.
 #
-sub TieDomainHash {
-    my ($domain, 
-	$namespace,
-	$how)     = @_;
+sub tie_domain_hash {
+    my ($domain,$namespace,$how,$loghead,$logtail) = @_;
     
     # Filter out any whitespace in the domain name:
     
@@ -971,17 +969,16 @@ sub TieDomainHash {
     my $resource_file  = $domain_dir."/$namespace.db";
     my %hash;
     if(tie(%hash, 'GDBM_File', $resource_file, $how, 0640)) {
-	if (scalar @_) {	# Need to log the operation.
-	    my $logFh = IO::File->new(">>domain_dir/$namespace.hist");
+	if (defined($loghead)) {	# Need to log the operation.
+	    my $logFh = IO::File->new(">>$domain_dir/$namespace.hist");
 	    if($logFh) {
 		my $timestamp = time;
-		my ($loghead, $logtail) = @_;
 		print $logFh "$loghead:$timestamp:$logtail\n";
 	    }
+	    $logFh->close;
 	}
 	return \%hash;		# Return the tied hash.
-    }
-    else {
+    } else {
 	return undef;		# Tie failed.
     }
 }
@@ -1005,44 +1002,513 @@ sub TieDomainHash {
 #   hash to which the database is tied.  It's up to the caller to untie.
 #   undef if the has could not be tied.
 #
-sub TieUserHash {
-    my ($domain,
-	$user,
-	$namespace,
-	$how)       = @_;
+sub tie_user_hash {
+    my ($domain,$user,$namespace,$how,$loghead,$what) = @_;
 
-    
     $namespace=~s/\//\_/g;	# / -> _
     $namespace=~s/\W//g;		# whitespace eliminated.
     my $proname     = propath($domain, $user);
    
-    # If this is a namespace for which a history is kept,
-    # make the history log entry:
-    
-    
-    if (($namespace =~/^nohist\_/) && (scalar @_ > 0)) {
-	my $args = scalar @_;
-	Debug(" Opening history: $namespace $args");
-	my $hfh = IO::File->new(">>$proname/$namespace.hist"); 
-	if($hfh) {
-	    my $now = time;
-	    my $loghead  = shift;
-	    my $what    = shift;
-	    print $hfh "$loghead:$now:$what\n";
-	}
-    }
     #  Tie the database.
     
     my %hash;
     if(tie(%hash, 'GDBM_File', "$proname/$namespace.db",
 	   $how, 0640)) {
+	# If this is a namespace for which a history is kept,
+	# make the history log entry:    
+	if (($namespace =~/^nohist\_/) && (defined($loghead))) {
+	    my $args = scalar @_;
+	    Debug(" Opening history: $namespace $args");
+	    my $hfh = IO::File->new(">>$proname/$namespace.hist"); 
+	    if($hfh) {
+		my $now = time;
+		print $hfh "$loghead:$now:$what\n";
+	    }
+	    $hfh->close;
+	}
 	return \%hash;
-    }
-    else {
+    } else {
 	return undef;
     }
     
 }
+
+#--------------------- Request Handlers --------------------------------------------
+#
+#   By convention each request handler registers itself prior to the sub 
+#   declaration:
+#
+
+#++
+#
+#  Handles ping requests.
+#  Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host we are
+#                       known as.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Side effects:
+#      Reply information is sent to the client.
+
+sub ping_handler {
+    my ($cmd, $tail, $client) = @_;
+    Debug("$cmd $tail $client .. $currenthostid:");
+   
+    Reply( $client,"$currenthostid\n","$cmd:$tail");
+   
+    return 1;
+}
+&register_handler("ping", \&ping_handler, 0, 1, 1);       # Ping unencoded, client or manager.
+
+#++
+#
+# Handles pong requests.  Pong replies with our current host id, and
+#                         the results of a ping sent to us via our lonc.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host we are
+#                       connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Side effects:
+#      Reply information is sent to the client.
+
+sub pong_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+    my $reply=&reply("ping",$clientname);
+    &Reply( $replyfd, "$currenthostid:$reply\n", "$cmd:$tail"); 
+    return 1;
+}
+&register_handler("pong", \&pong_handler, 0, 1, 1);       # Pong unencoded, client or manager
+
+#++
+#      Called to establish an encrypted session key with the remote client.
+#      Note that with secure lond, in most cases this function is never
+#      invoked.  Instead, the secure session key is established either
+#      via a local file that's locked down tight and only lives for a short
+#      time, or via an ssl tunnel...and is generated from a bunch-o-random
+#      bits from /dev/urandom, rather than the predictable pattern used by
+#      by this sub.  This sub is only used in the old-style insecure
+#      key negotiation.
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host
+#                       known as.
+#      $clientname    - Global variable that carries the name of the hsot we're connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Implicit Outputs:
+#      Reply information is sent to the client.
+#      $cipher is set with a reference to a new IDEA encryption object.
+#
+sub establish_key_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+    my $buildkey=time.$$.int(rand 100000);
+    $buildkey=~tr/1-6/A-F/;
+    $buildkey=int(rand 100000).$buildkey.int(rand 100000);
+    my $key=$currenthostid.$clientname;
+    $key=~tr/a-z/A-Z/;
+    $key=~tr/G-P/0-9/;
+    $key=~tr/Q-Z/0-9/;
+    $key=$key.$buildkey.$key.$buildkey.$key.$buildkey;
+    $key=substr($key,0,32);
+    my $cipherkey=pack("H32",$key);
+    $cipher=new IDEA $cipherkey;
+    &Reply($replyfd, "$buildkey\n", "$cmd:$tail"); 
+   
+    return 1;
+
+}
+&register_handler("ekey", \&establish_key_handler, 0, 1,1);
+
+
+#     Handler for the load command.  Returns the current system load average
+#     to the requestor.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host
+#                       known as.
+#      $clientname    - Global variable that carries the name of the hsot we're connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit.
+#  Side effects:
+#      Reply information is sent to the client.
+sub load_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+   # Get the load average from /proc/loadavg and calculate it as a percentage of
+   # the allowed load limit as set by the perl global variable lonLoadLim
+
+    my $loadavg;
+    my $loadfile=IO::File->new('/proc/loadavg');
+   
+    $loadavg=<$loadfile>;
+    $loadavg =~ s/\s.*//g;                      # Extract the first field only.
+   
+    my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
+
+    &Reply( $replyfd, "$loadpercent\n", "$cmd:$tail");
+   
+    return 1;
+}
+register_handler("load", \&load_handler, 0, 1, 0);
+
+#
+#   Process the userload request.  This sub returns to the client the current
+#  user load average.  It can be invoked either by clients or managers.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Implicit Inputs:
+#      $currenthostid - Global variable that carries the name of the host
+#                       known as.
+#      $clientname    - Global variable that carries the name of the hsot we're connected to.
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+# Implicit inputs:
+#     whatever the userload() function requires.
+#  Implicit outputs:
+#     the reply is written to the client.
+#
+sub user_load_handler {
+    my ($cmd, $tail, $replyfd) = @_;
+
+    my $userloadpercent=&userload();
+    &Reply($replyfd, "$userloadpercent\n", "$cmd:$tail");
+    
+    return 1;
+}
+register_handler("userload", \&user_load_handler, 0, 1, 0);
+
+#   Process a request for the authorization type of a user:
+#   (userauth).
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $replyfd- File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+# Implicit outputs:
+#    The user authorization type is written to the client.
+#
+sub user_authorization_type {
+    my ($cmd, $tail, $replyfd) = @_;
+   
+    my $userinput = "$cmd:$tail";
+   
+    #  Pull the domain and username out of the command tail.
+    # and call get_auth_type to determine the authentication type.
+   
+    my ($udom,$uname)=split(/:/,$tail);
+    my $result = &get_auth_type($udom, $uname);
+    if($result eq "nouser") {
+	&Failure( $replyfd, "unknown_user\n", $userinput);
+    } else {
+	#
+	# We only want to pass the second field from get_auth_type
+	# for ^krb.. otherwise we'll be handing out the encrypted
+	# password for internals e.g.
+	#
+	my ($type,$otherinfo) = split(/:/,$result);
+	if($type =~ /^krb/) {
+	    $type = $result;
+	}
+	&Reply( $replyfd, "$type:\n", $userinput);
+    }
+  
+    return 1;
+}
+&register_handler("currentauth", \&user_authorization_type, 1, 1, 0);
+
+#   Process a request by a manager to push a hosts or domain table 
+#   to us.  We pick apart the command and pass it on to the subs
+#   that already exist to do this.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $client - File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+# Implicit Output:
+#    a reply is written to the client.
+
+sub push_file_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput = "$cmd:$tail";
+
+    # At this time we only know that the IP of our partner is a valid manager
+    # the code below is a hook to do further authentication (e.g. to resolve
+    # spoofing).
+
+    my $cert = &GetCertificate($userinput);
+    if(&ValidManager($cert)) { 
+
+	# Now presumably we have the bona fides of both the peer host and the
+	# process making the request.
+      
+	my $reply = &PushFile($userinput);
+	&Reply($client, "$reply\n", $userinput);
+
+    } else {
+	&Failure( $client, "refused\n", $userinput);
+    } 
+    return 1;
+}
+&register_handler("pushfile", \&push_file_handler, 1, 0, 1);
+
+
+
+#   Process a reinit request.  Reinit requests that either
+#   lonc or lond be reinitialized so that an updated 
+#   host.tab or domain.tab can be processed.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $client - File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+#  Implicit output:
+#     a reply is sent to the client.
+#
+sub reinit_process_handler {
+    my ($cmd, $tail, $client) = @_;
+   
+    my $userinput = "$cmd:$tail";
+   
+    my $cert = &GetCertificate($userinput);
+    if(&ValidManager($cert)) {
+	chomp($userinput);
+	my $reply = &ReinitProcess($userinput);
+	&Reply( $client,  "$reply\n", $userinput);
+    } else {
+	&Failure( $client, "refused\n", $userinput);
+    }
+    return 1;
+}
+
+&register_handler("reinit", \&reinit_process_handler, 1, 0, 1);
+
+#  Process the editing script for a table edit operation.
+#  the editing operation must be encrypted and requested by
+#  a manager host.
+#
+# Parameters:
+#      $cmd    - the actual keyword that invoked us.
+#      $tail   - the tail of the request that invoked us.
+#      $client - File descriptor connected to the client
+#  Returns:
+#      1       - Ok to continue processing.
+#      0       - Program should exit
+#  Implicit output:
+#     a reply is sent to the client.
+#
+sub edit_table_handler {
+    my ($command, $tail, $client) = @_;
+   
+    my $userinput = "$command:$tail";
+
+    my $cert = &GetCertificate($userinput);
+    if(&ValidManager($cert)) {
+	my($filetype, $script) = split(/:/, $tail);
+	if (($filetype eq "hosts") || 
+	    ($filetype eq "domain")) {
+	    if($script ne "") {
+		&Reply($client,              # BUGBUG - EditFile
+		      &EditFile($userinput), #   could fail.
+		      $userinput);
+	    } else {
+		&Failure($client,"refused\n",$userinput);
+	    }
+	} else {
+	    &Failure($client,"refused\n",$userinput);
+	}
+    } else {
+	&Failure($client,"refused\n",$userinput);
+    }
+    return 1;
+}
+register_handler("edit", \&edit_table_handler, 1, 0, 1);
+
+
+#
+#   Authenticate a user against the LonCAPA authentication
+#   database.  Note that there are several authentication
+#   possibilities:
+#   - unix     - The user can be authenticated against the unix
+#                password file.
+#   - internal - The user can be authenticated against a purely 
+#                internal per user password file.
+#   - kerberos - The user can be authenticated against either a kerb4 or kerb5
+#                ticket granting authority.
+#   - user     - The person tailoring LonCAPA can supply a user authentication
+#                mechanism that is per system.
+#
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+#
+sub authenticate_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    
+    #  Regenerate the full input line 
+    
+    my $userinput  = $cmd.":".$tail;
+    
+    #  udom    - User's domain.
+    #  uname   - Username.
+    #  upass   - User's password.
+    
+    my ($udom,$uname,$upass)=split(/:/,$tail);
+    &Debug(" Authenticate domain = $udom, user = $uname, password = $upass");
+    chomp($upass);
+    $upass=&unescape($upass);
+
+    my $pwdcorrect = &validate_user($udom, $uname, $upass);
+    if($pwdcorrect) {
+	&Reply( $client, "authorized\n", $userinput);
+	#
+	#  Bad credentials: Failed to authorize
+	#
+    } else {
+	&Failure( $client, "non_authorized\n", $userinput);
+    }
+
+    return 1;
+}
+
+register_handler("auth", \&authenticate_handler, 1, 1, 0);
+
+#
+#   Change a user's password.  Note that this function is complicated by
+#   the fact that a user may be authenticated in more than one way:
+#   At present, we are not able to change the password for all types of
+#   authentication methods.  Only for:
+#      unix    - unix password or shadow passoword style authentication.
+#      local   - Locally written authentication mechanism.
+#   For now, kerb4 and kerb5 password changes are not supported and result
+#   in an error.
+# FUTURE WORK:
+#    Support kerberos passwd changes?
+# Parameters:
+#    $cmd      - The command that got us here.
+#    $tail     - Tail of the command (remaining parameters).
+#    $client   - File descriptor connected to client.
+# Returns
+#     0        - Requested to exit, caller should shut down.
+#     1        - Continue processing.
+# Implicit inputs:
+#    The authentication systems describe above have their own forms of implicit
+#    input into the authentication process that are described above.
+sub change_password_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $userinput = $cmd.":".$tail;           # Reconstruct client's string.
+
+    #
+    #  udom  - user's domain.
+    #  uname - Username.
+    #  upass - Current password.
+    #  npass - New password.
+   
+    my ($udom,$uname,$upass,$npass)=split(/:/,$tail);
+
+    $upass=&unescape($upass);
+    $npass=&unescape($npass);
+    &Debug("Trying to change password for $uname");
+
+    # First require that the user can be authenticated with their
+    # old password:
+
+    my $validated = &validate_user($udom, $uname, $upass);
+    if($validated) {
+	my $realpasswd  = &get_auth_type($udom, $uname); # Defined since authd.
+	
+	my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
+	if ($howpwd eq 'internal') {
+	    &Debug("internal auth");
+	    my $salt=time;
+	    $salt=substr($salt,6,2);
+	    my $ncpass=crypt($npass,$salt);
+	    if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
+		&logthis("Result of password change for "
+			 ."$uname: pwchange_success");
+		&Reply($client, "ok\n", $userinput);
+	    } else {
+		&logthis("Unable to open $uname passwd "               
+			 ."to change password");
+		&Failure( $client, "non_authorized\n",$userinput);
+	    }
+	} elsif ($howpwd eq 'unix') {
+	    # Unix means we have to access /etc/password
+	    &Debug("auth is unix");
+	    my $execdir=$perlvar{'lonDaemons'};
+	    &Debug("Opening lcpasswd pipeline");
+	    my $pf = IO::File->new("|$execdir/lcpasswd > "
+				   ."$perlvar{'lonDaemons'}"
+				   ."/logs/lcpasswd.log");
+	    print $pf "$uname\n$npass\n$npass\n";
+	    close $pf;
+	    my $err = $?;
+	    my $result = ($err>0 ? 'pwchange_failure' : 'ok');
+	    &logthis("Result of password change for $uname: ".
+		     &lcpasswdstrerror($?));
+	    &Reply($client, "$result\n", $userinput);
+	} else {
+	    # this just means that the current password mode is not
+	    # one we know how to change (e.g the kerberos auth modes or
+	    # locally written auth handler).
+	    #
+	    &Failure( $client, "auth_mode_error\n", $userinput);
+	}  
+	
+    } else {
+	&Failure( $client, "non_authorized\n", $userinput);
+    }
+
+    return 1;
+}
+register_handler("passwd", \&change_password_handler, 1, 1, 0);
+
+
 #---------------------------------------------------------------
 #
 #   Getting, decoding and dispatching requests:
@@ -1054,16 +1520,1414 @@ sub TieUserHash {
 #   is defined as a 'line' of text.  We remove the new line
 #   from the text line.  
 #   
-sub GetRequest {
+sub get_request {
     my $input = <$client>;
     chomp($input);
 
-    Debug("Request = $input\n");
+    Debug("get_request: Request = $input\n");
 
     &status('Processing '.$clientname.':'.$input);
 
     return $input;
 }
+#---------------------------------------------------------------
+#
+#  Process a request.  This sub should shrink as each action
+#  gets farmed out into a separat sub that is registered 
+#  with the dispatch hash.  
+#
+# Parameters:
+#    user_input   - The request received from the client (lonc).
+# Returns:
+#    true to keep processing, false if caller should exit.
+#
+sub process_request {
+    my ($userinput) = @_;      # Easier for now to break style than to
+                                # fix all the userinput -> user_input.
+    my $wasenc    = 0;		# True if request was encrypted.
+# ------------------------------------------------------------ See if encrypted
+    if ($userinput =~ /^enc/) {
+	$userinput = decipher($userinput);
+	$wasenc=1;
+	if(!$userinput) {	# Cipher not defined.
+	    &Failure($client, "error: Encrypted data without negotated key");
+	    return 0;
+	}
+    }
+    Debug("process_request: $userinput\n");
+    
+    #  
+    #   The 'correct way' to add a command to lond is now to
+    #   write a sub to execute it and Add it to the command dispatch
+    #   hash via a call to register_handler..  The comments to that
+    #   sub should give you enough to go on to show how to do this
+    #   along with the examples that are building up as this code
+    #   is getting refactored.   Until all branches of the
+    #   if/elseif monster below have been factored out into
+    #   separate procesor subs, if the dispatch hash is missing
+    #   the command keyword, we will fall through to the remainder
+    #   of the if/else chain below in order to keep this thing in 
+    #   working order throughout the transmogrification.
+
+    my ($command, $tail) = split(/:/, $userinput, 2);
+    chomp($command);
+    chomp($tail);
+    $tail =~ s/(\r)//;		# This helps people debugging with e.g. telnet.
+    $command =~ s/(\r)//;	# And this too for parameterless commands.
+    if(!$tail) {
+	$tail ="";		# defined but blank.
+    }
+
+    &Debug("Command received: $command, encoded = $wasenc");
+
+    if(defined $Dispatcher{$command}) {
+
+	my $dispatch_info = $Dispatcher{$command};
+	my $handler       = $$dispatch_info[0];
+	my $need_encode   = $$dispatch_info[1];
+	my $client_types  = $$dispatch_info[2];
+	Debug("Matched dispatch hash: mustencode: $need_encode "
+	      ."ClientType $client_types");
+      
+	#  Validate the request:
+      
+	my $ok = 1;
+	my $requesterprivs = 0;
+	if(&isClient()) {
+	    $requesterprivs |= $CLIENT_OK;
+	}
+	if(&isManager()) {
+	    $requesterprivs |= $MANAGER_OK;
+	}
+	if($need_encode && (!$wasenc)) {
+	    Debug("Must encode but wasn't: $need_encode $wasenc");
+	    $ok = 0;
+	}
+	if(($client_types & $requesterprivs) == 0) {
+	    Debug("Client not privileged to do this operation");
+	    $ok = 0;
+	}
+
+	if($ok) {
+	    Debug("Dispatching to handler $command $tail");
+	    my $keep_going = &$handler($command, $tail, $client);
+	    return $keep_going;
+	} else {
+	    Debug("Refusing to dispatch because client did not match requirements");
+	    Failure($client, "refused\n", $userinput);
+	    return 1;
+	}
+
+    }    
+
+#------------------- Commands not yet in spearate handlers. --------------
+
+
+
+# -------------------------------------------------------------------- makeuser
+    if ($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/) { # 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);
+		Reply($client, $result, $userinput);
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------ home
+    } 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/) { # 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/) { # 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/) { # 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/) {
+	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/) {
+	if(isClient) {
+	    print $client &subscribe($userinput,$clientip);
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------- current version
+    } 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/) {
+	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/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput,5);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    if ($namespace ne 'roles') {
+		chomp($what);
+		my $proname=propath($udom,$uname);
+		my $now=time;
+		my @pairs=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',
+			"$proname/$namespace.db",
+			&GDBM_WRCREAT(),0640)) {
+		    unless ($namespace=~/^nohist\_/) {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { print $hfh "P:$now:$what\n"; }
+		    }
+		    
+		    foreach my $pair (@pairs) {
+			my ($key,$value)=split(/=/,$pair);
+			$hash{$key}=$value;
+		    }
+		    if (untie(%hash)) {
+			print $client "ok\n";
+		    } else {
+			print $client "error: ".($!+0)
+			    ." untie(GDBM) failed ".
+			    "while attempting 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;
+		my @pairs=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',
+			"$proname/$namespace.db",
+			&GDBM_WRCREAT(),0640)) {
+		    unless ($namespace=~/^nohist\_/) {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { print $hfh "P:$now:$what\n"; }
+		    }
+		    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/) {
+	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 @pairs=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		    {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { 
+			    print $hfh "P:$now:$exedom:$exeuser:$what\n";
+			}
+		    }
+		    
+		    foreach my $pair (@pairs) {
+			my ($key,$value)=split(/=/,$pair);
+			&ManagePermissions($key, $udom, $uname,
+					   &get_auth_type( $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/) {
+	if(isClient) {
+	    &Debug("rolesdel");
+	    if ($wasenc==1) {
+		my ($cmd,$exedom,$exeuser,$udom,$uname,$what)
+		    =split(/:/,$userinput);
+		&Debug("cmd = ".$cmd." exedom= ".$exedom.
+		       "user = ".$exeuser." udom=".$udom.
+		       "what = ".$what);
+		my $namespace='roles';
+		chomp($what);
+		my $proname=propath($udom,$uname);
+		my $now=time;
+		my @rolekeys=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		    {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { 
+			    print $hfh "D:$now:$exedom:$exeuser:$what\n";
+			}
+		    }
+		    foreach my $key (@rolekeys) {
+			delete $hash{$key};
+		    }
+		    if (untie(%hash)) {
+			print $client "ok\n";
+		    } else {
+			print $client "error: ".($!+0)
+			    ." untie(GDBM) Failed ".
+			    "while attempting rolesdel\n";
+		    }
+		} else {
+		    print $client "error: ".($!+0)
+			." tie(GDBM) Failed ".
+			"while attempting rolesdel\n";
+		}
+	    } else {
+		print $client "refused\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------- get
+    } elsif ($userinput =~ /^get/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($what);
+	    my @queries=split(/\&/,$what);
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+		for (my $i=0;$i<=$#queries;$i++) {
+		    $qresult.="$hash{$queries[$i]}&";
+		}
+		if (untie(%hash)) {
+		    $qresult=~s/\&$//;
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting get\n";
+		}
+	    } else {
+		if ($!+0 == 2) {
+		    print $client "error:No such file or ".
+			"GDBM reported bad block error\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." tie(GDBM) Failed ".
+			"while attempting get\n";
+		}
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------ eget
+    } elsif ($userinput =~ /^eget/) {
+	if (isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($what);
+	    my @queries=split(/\&/,$what);
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+		for (my $i=0;$i<=$#queries;$i++) {
+		    $qresult.="$hash{$queries[$i]}&";
+		}
+		if (untie(%hash)) {
+		    $qresult=~s/\&$//;
+		    if ($cipher) {
+			my $cmdlength=length($qresult);
+			$qresult.="         ";
+			my $encqresult='';
+			for 
+			    (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+				$encqresult.=
+				    unpack("H16",
+					   $cipher->encrypt(substr($qresult,$encidx,8)));
+			    }
+			print $client "enc:$cmdlength:$encqresult\n";
+		    } else {
+			print $client "error:no_key\n";
+		    }
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting eget\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting eget\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------- del
+    } elsif ($userinput =~ /^del/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($what);
+	    my $proname=propath($udom,$uname);
+	    my $now=time;
+	    my @keys=split(/\&/,$what);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		unless ($namespace=~/^nohist\_/) {
+		    my $hfh;
+		    if ($hfh=IO::File->new(">>$proname/$namespace.hist")) { print $hfh "D:$now:$what\n"; }
+		}
+		foreach my $key (@keys) {
+		    delete($hash{$key});
+		}
+		if (untie(%hash)) {
+		    print $client "ok\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting del\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting del\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------------ keys
+    } elsif ($userinput =~ /^keys/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+		foreach my $key (keys %hash) {
+		    $qresult.="$key&";
+		}
+		if (untie(%hash)) {
+		    $qresult=~s/\&$//;
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting keys\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting keys\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------- dumpcurrent
+    } elsif ($userinput =~ /^currentdump/) {
+	if (isClient) {
+	    my ($cmd,$udom,$uname,$namespace)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    my $qresult='';
+	    my $proname=propath($udom,$uname);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',
+		    "$proname/$namespace.db",
+		    &GDBM_READER(),0640)) {
+			    # Structure of %data:
+		# $data{$symb}->{$parameter}=$value;
+		# $data{$symb}->{'v.'.$parameter}=$version;
+		# since $parameter will be unescaped, we do not
+		# have to worry about silly parameter names...
+		my %data = ();
+		while (my ($key,$value) = each(%hash)) {
+		    my ($v,$symb,$param) = split(/:/,$key);
+		    next if ($v eq 'version' || $symb eq 'keys');
+		    next if (exists($data{$symb}) && 
+			     exists($data{$symb}->{$param}) &&
+			     $data{$symb}->{'v.'.$param} > $v);
+		    $data{$symb}->{$param}=$value;
+		    $data{$symb}->{'v.'.$param}=$v;
+		}
+		if (untie(%hash)) {
+		    while (my ($symb,$param_hash) = each(%data)) {
+			while(my ($param,$value) = each (%$param_hash)){
+			    next if ($param =~ /^v\./);
+			    $qresult.=$symb.':'.$param.'='.$value.'&';
+			}
+		    }
+		    chop($qresult);
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting currentdump\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting currentdump\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	}
+# ------------------------------------------------------------------------ dump
+    } elsif ($userinput =~ /^dump/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$regexp)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    if (defined($regexp)) {
+		$regexp=&unescape($regexp);
+	    } else {
+		$regexp='.';
+	    }
+	    my $qresult='';
+	    my $proname=propath($udom,$uname);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+		while (my ($key,$value) = each(%hash)) {
+		    if ($regexp eq '.') {
+			$qresult.=$key.'='.$value.'&';
+		    } else {
+			my $unescapeKey = &unescape($key);
+			if (eval('$unescapeKey=~/$regexp/')) {
+			    $qresult.="$key=$value&";
+			}
+		    }
+		}
+		if (untie(%hash)) {
+		    chop($qresult);
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting dump\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting dump\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------------- store
+    } elsif ($userinput =~ /^store/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$rid,$what)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    if ($namespace ne 'roles') {
+		chomp($what);
+		my $proname=propath($udom,$uname);
+		my $now=time;
+		my @pairs=split(/\&/,$what);
+		my %hash;
+		if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_WRCREAT(),0640)) {
+		    unless ($namespace=~/^nohist\_/) {
+			my $hfh;
+			if ($hfh=IO::File->new(">>$proname/$namespace.hist")) {
+			    print $hfh "P:$now:$rid:$what\n";
+			}
+		    }
+		    my @previouskeys=split(/&/,$hash{"keys:$rid"});
+		    my $key;
+		    $hash{"version:$rid"}++;
+		    my $version=$hash{"version:$rid"};
+		    my $allkeys=''; 
+		    foreach my $pair (@pairs) {
+			my ($key,$value)=split(/=/,$pair);
+			$allkeys.=$key.':';
+			$hash{"$version:$rid:$key"}=$value;
+		    }
+		    $hash{"$version:$rid:timestamp"}=$now;
+		    $allkeys.='timestamp';
+		    $hash{"$version:keys:$rid"}=$allkeys;
+		    if (untie(%hash)) {
+			print $client "ok\n";
+		    } else {
+			print $client "error: ".($!+0)
+			    ." untie(GDBM) Failed ".
+			    "while attempting store\n";
+				}
+		} else {
+		    print $client "error: ".($!+0)
+			." tie(GDBM) Failed ".
+			"while attempting store\n";
+		}
+	    } else {
+		print $client "refused\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# --------------------------------------------------------------------- restore
+    } elsif ($userinput =~ /^restore/) {
+	if(isClient) {
+	    my ($cmd,$udom,$uname,$namespace,$rid)
+		=split(/:/,$userinput);
+	    $namespace=~s/\//\_/g;
+	    $namespace=~s/\W//g;
+	    chomp($rid);
+	    my $proname=propath($udom,$uname);
+	    my $qresult='';
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
+		my $version=$hash{"version:$rid"};
+		$qresult.="version=$version&";
+		my $scope;
+		for ($scope=1;$scope<=$version;$scope++) {
+		    my $vkeys=$hash{"$scope:keys:$rid"};
+		    my @keys=split(/:/,$vkeys);
+		    my $key;
+		    $qresult.="$scope:keys=$vkeys&";
+		    foreach $key (@keys) {
+			$qresult.="$scope:$key=".$hash{"$scope:$rid:$key"}."&";
+		    }                                  
+		}
+		if (untie(%hash)) {
+		    $qresult=~s/\&$//;
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting restore\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting restore\n";
+	    }
+	} else  {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# -------------------------------------------------------------------- chatsend
+    } elsif ($userinput =~ /^chatsend/) {
+	if(isClient) {
+	    my ($cmd,$cdom,$cnum,$newpost)=split(/\:/,$userinput);
+	    &chatadd($cdom,$cnum,$newpost);
+	    print $client "ok\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# -------------------------------------------------------------------- chatretr
+    } elsif ($userinput =~ /^chatretr/) {
+	if(isClient) {
+	    my 
+		($cmd,$cdom,$cnum,$udom,$uname)=split(/\:/,$userinput);
+	    my $reply='';
+	    foreach (&getchat($cdom,$cnum,$udom,$uname)) {
+		$reply.=&escape($_).':';
+	    }
+	    $reply=~s/\:$//;
+	    print $client $reply."\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------- querysend
+    } elsif ($userinput =~ /^querysend/) {
+	if (isClient) {
+	    my ($cmd,$query,
+		$arg1,$arg2,$arg3)=split(/\:/,$userinput);
+	    $query=~s/\n*$//g;
+	    print $client "".
+		sqlreply("$clientname\&$query".
+			 "\&$arg1"."\&$arg2"."\&$arg3")."\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------ queryreply
+    } elsif ($userinput =~ /^queryreply/) {
+	if(isClient) {
+	    my ($cmd,$id,$reply)=split(/:/,$userinput); 
+	    my $store;
+	    my $execdir=$perlvar{'lonDaemons'};
+	    if ($store=IO::File->new(">$execdir/tmp/$id")) {
+		$reply=~s/\&/\n/g;
+		print $store $reply;
+		close $store;
+		my $store2=IO::File->new(">$execdir/tmp/$id.end");
+		print $store2 "done\n";
+		close $store2;
+		print $client "ok\n";
+	    } else {
+		print $client "error: ".($!+0)
+		    ." IO::File->new Failed ".
+		    "while attempting queryreply\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------- courseidput
+    } elsif ($userinput =~ /^courseidput/) {
+	if(isClient) {
+	    my ($cmd,$udom,$what)=split(/:/,$userinput);
+	    chomp($what);
+			$udom=~s/\W//g;
+	    my $proname=
+		"$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
+	    my $now=time;
+	    my @pairs=split(/\&/,$what);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
+		foreach my $pair (@pairs) {
+		    my ($key,$descr,$inst_code)=split(/=/,$pair);
+		    $hash{$key}=$descr.':'.$inst_code.':'.$now;
+		}
+		if (untie(%hash)) {
+		    print $client "ok\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting courseidput\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting courseidput\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ---------------------------------------------------------------- courseiddump
+    } elsif ($userinput =~ /^courseiddump/) {
+	if(isClient) {
+	    my ($cmd,$udom,$since,$description)
+		=split(/:/,$userinput);
+	    if (defined($description)) {
+		$description=&unescape($description);
+	    } else {
+		$description='.';
+	    }
+	    unless (defined($since)) { $since=0; }
+	    my $qresult='';
+	    my $proname=
+		"$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
+		while (my ($key,$value) = each(%hash)) {
+		    my ($descr,$lasttime,$inst_code);
+		    if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
+			($descr,$inst_code,$lasttime)=($1,$2,$3);
+		    } else {
+			($descr,$lasttime) = split(/\:/,$value);
+		    }
+		    if ($lasttime<$since) { next; }
+		    if ($description eq '.') {
+			$qresult.=$key.'='.$descr.':'.$inst_code.'&';
+		    } else {
+			my $unescapeVal = &unescape($descr);
+			if (eval('$unescapeVal=~/\Q$description\E/i')) {
+			    $qresult.=$key.'='.$descr.':'.$inst_code.'&';
+			}
+		    }
+		}
+		if (untie(%hash)) {
+		    chop($qresult);
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting courseiddump\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting courseiddump\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------------- idput
+    } elsif ($userinput =~ /^idput/) {
+	if(isClient) {
+	    my ($cmd,$udom,$what)=split(/:/,$userinput);
+	    chomp($what);
+	    $udom=~s/\W//g;
+	    my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
+	    my $now=time;
+	    my @pairs=split(/\&/,$what);
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
+		{
+		    my $hfh;
+		    if ($hfh=IO::File->new(">>$proname.hist")) {
+			print $hfh "P:$now:$what\n";
+		    }
+		}
+		foreach my $pair (@pairs) {
+		    my ($key,$value)=split(/=/,$pair);
+		    $hash{$key}=$value;
+		}
+		if (untie(%hash)) {
+		    print $client "ok\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting idput\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting idput\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------------- idget
+    } elsif ($userinput =~ /^idget/) {
+	if(isClient) {
+	    my ($cmd,$udom,$what)=split(/:/,$userinput);
+	    chomp($what);
+	    $udom=~s/\W//g;
+	    my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
+	    my @queries=split(/\&/,$what);
+	    my $qresult='';
+	    my %hash;
+	    if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
+		for (my $i=0;$i<=$#queries;$i++) {
+		    $qresult.="$hash{$queries[$i]}&";
+		}
+		if (untie(%hash)) {
+		    $qresult=~s/\&$//;
+		    print $client "$qresult\n";
+		} else {
+		    print $client "error: ".($!+0)
+			." untie(GDBM) Failed ".
+			"while attempting idget\n";
+		}
+	    } else {
+		print $client "error: ".($!+0)
+		    ." tie(GDBM) Failed ".
+		    "while attempting idget\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ---------------------------------------------------------------------- tmpput
+    } elsif ($userinput =~ /^tmpput/) {
+	if(isClient) {
+	    my ($cmd,$what)=split(/:/,$userinput);
+	    my $store;
+	    $tmpsnum++;
+	    my $id=$$.'_'.$clientip.'_'.$tmpsnum;
+	    $id=~s/\W/\_/g;
+	    $what=~s/\n//g;
+	    my $execdir=$perlvar{'lonDaemons'};
+	    if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
+		print $store $what;
+		close $store;
+		print $client "$id\n";
+	    }
+	    else {
+		print $client "error: ".($!+0)
+		    ."IO::File->new Failed ".
+		    "while attempting tmpput\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+	
+# ---------------------------------------------------------------------- tmpget
+    } elsif ($userinput =~ /^tmpget/) {
+	if(isClient) {
+	    my ($cmd,$id)=split(/:/,$userinput);
+	    chomp($id);
+	    $id=~s/\W/\_/g;
+	    my $store;
+	    my $execdir=$perlvar{'lonDaemons'};
+	    if ($store=IO::File->new("$execdir/tmp/$id.tmp")) {
+		my $reply=<$store>;
+			    print $client "$reply\n";
+		close $store;
+	    }
+	    else {
+		print $client "error: ".($!+0)
+		    ."IO::File->new Failed ".
+		    "while attempting tmpget\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ---------------------------------------------------------------------- tmpdel
+    } elsif ($userinput =~ /^tmpdel/) {
+	if(isClient) {
+	    my ($cmd,$id)=split(/:/,$userinput);
+	    chomp($id);
+	    $id=~s/\W/\_/g;
+	    my $execdir=$perlvar{'lonDaemons'};
+	    if (unlink("$execdir/tmp/$id.tmp")) {
+		print $client "ok\n";
+	    } else {
+		print $client "error: ".($!+0)
+		    ."Unlink tmp Failed ".
+		    "while attempting tmpdel\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------- portfolio directory list (portls)
+    } elsif ($userinput =~ /^portls/) {
+	if(isClient) {
+	    my ($cmd,$uname,$udom)=split(/:/,$userinput);
+	    my $udir=propath($udom,$uname).'/userfiles/portfolio';
+	    my $dirLine='';
+	    my $dirContents='';
+	    if (opendir(LSDIR,$udir.'/')){
+		while ($dirLine = readdir(LSDIR)){
+		    $dirContents = $dirContents.$dirLine.'<br />';
+		}
+	    } else {
+		$dirContents = "No directory found\n";
+	    }
+	    print $client $dirContents."\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	}
+# -------------------------------------------------------------------------- ls
+    } elsif ($userinput =~ /^ls/) {
+	if(isClient) {
+	    my $obs;
+	    my $rights;
+	    my ($cmd,$ulsdir)=split(/:/,$userinput);
+	    my $ulsout='';
+	    my $ulsfn;
+	    if (-e $ulsdir) {
+		if(-d $ulsdir) {
+		    if (opendir(LSDIR,$ulsdir)) {
+			while ($ulsfn=readdir(LSDIR)) {
+			    undef $obs, $rights; 
+			    my @ulsstats=stat($ulsdir.'/'.$ulsfn);
+			    #We do some obsolete checking here
+			    if(-e $ulsdir.'/'.$ulsfn.".meta") { 
+				open(FILE, $ulsdir.'/'.$ulsfn.".meta");
+				my @obsolete=<FILE>;
+				foreach my $obsolete (@obsolete) {
+				    if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
+				    if($obsolete =~ m|(<copyright>)(default)|) { $rights = 1; }
+				}
+			    }
+			    $ulsout.=$ulsfn.'&'.join('&',@ulsstats);
+			    if($obs eq '1') { $ulsout.="&1"; }
+			    else { $ulsout.="&0"; }
+			    if($rights eq '1') { $ulsout.="&1:"; }
+			    else { $ulsout.="&0:"; }
+			}
+			closedir(LSDIR);
+		    }
+		} else {
+		    my @ulsstats=stat($ulsdir);
+		    $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+		}
+	    } else {
+		$ulsout='no_such_dir';
+	    }
+	    if ($ulsout eq '') { $ulsout='empty'; }
+	    print $client "$ulsout\n";
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ----------------------------------------------------------------- setannounce
+    } elsif ($userinput =~ /^setannounce/) {
+	if (isClient) {
+	    my ($cmd,$announcement)=split(/:/,$userinput);
+	    chomp($announcement);
+	    $announcement=&unescape($announcement);
+	    if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
+					'/announcement.txt')) {
+		print $store $announcement;
+		close $store;
+		print $client "ok\n";
+	    } else {
+		print $client "error: ".($!+0)."\n";
+	    }
+	} else {
+	    Reply($client, "refused\n", $userinput);
+	    
+	}
+# ------------------------------------------------------------------ Hanging up
+    } elsif (($userinput =~ /^exit/) ||
+	     ($userinput =~ /^init/)) { # no restrictions.
+	&logthis(
+		 "Client $clientip ($clientname) hanging up: $userinput");
+	print $client "bye\n";
+	$client->shutdown(2);        # shutdown the socket forcibly.
+	$client->close();
+	return 0;
+	
+# ---------------------------------- set current host/domain
+    } elsif ($userinput =~ /^sethost:/) {
+	if (isClient) {
+	    print $client &sethost($userinput)."\n";
+	} else {
+	    print $client "refused\n";
+	}
+#---------------------------------- request file (?) version.
+    } elsif ($userinput =~/^version:/) {
+	if (isClient) {
+	    print $client &version($userinput)."\n";
+	} else {
+	    print $client "refused\n";
+	}
+#------------------------------- is auto-enrollment enabled?
+    } elsif ($userinput =~/^autorun:/) {
+	if (isClient) {
+	    my ($cmd,$cdom) = split(/:/,$userinput);
+	    my $outcome = &localenroll::run($cdom);
+	    print $client "$outcome\n";
+	} else {
+	    print $client "0\n";
+	}
+#------------------------------- get official sections (for auto-enrollment).
+    } elsif ($userinput =~/^autogetsections:/) {
+	if (isClient) {
+	    my ($cmd,$coursecode,$cdom)=split(/:/,$userinput);
+	    my @secs = &localenroll::get_sections($coursecode,$cdom);
+	    my $seclist = &escape(join(':',@secs));
+	    print $client "$seclist\n";
+	} else {
+	    print $client "refused\n";
+	}
+#----------------------- validate owner of new course section (for auto-enrollment).
+    } elsif ($userinput =~/^autonewcourse:/) {
+	if (isClient) {
+	    my ($cmd,$inst_course_id,$owner,$cdom)=split(/:/,$userinput);
+	    my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
+	    print $client "$outcome\n";
+	} else {
+	    print $client "refused\n";
+	}
+#-------------- validate course section in schedule of classes (for auto-enrollment).
+    } elsif ($userinput =~/^autovalidatecourse:/) {
+	if (isClient) {
+	    my ($cmd,$inst_course_id,$cdom)=split(/:/,$userinput);
+	    my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
+	    print $client "$outcome\n";
+	} else {
+	    print $client "refused\n";
+	}
+#--------------------------- create password for new user (for auto-enrollment).
+    } elsif ($userinput =~/^autocreatepassword:/) {
+	if (isClient) {
+	    my ($cmd,$authparam,$cdom)=split(/:/,$userinput);
+	    my ($create_passwd,$authchk);
+	    ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam,$cdom);
+	    print $client &escape($authparam.':'.$create_passwd.':'.$authchk)."\n";
+	} else {
+	    print $client "refused\n";
+	}
+#---------------------------  read and remove temporary files (for auto-enrollment).
+    } elsif ($userinput =~/^autoretrieve:/) {
+	if (isClient) {
+	    my ($cmd,$filename) = split(/:/,$userinput);
+	    my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
+	    if ( (-e $source) && ($filename ne '') ) {
+		my $reply = '';
+		if (open(my $fh,$source)) {
+		    while (<$fh>) {
+			chomp($_);
+			$_ =~ s/^\s+//g;
+			$_ =~ s/\s+$//g;
+			$reply .= $_;
+		    }
+		    close($fh);
+		    print $client &escape($reply)."\n";
+#                                unlink($source);
+		} else {
+		    print $client "error\n";
+		}
+	    } else {
+		print $client "error\n";
+	    }
+	} else {
+	    print $client "refused\n";
+	}
+#---------------------  read and retrieve institutional code format (for support form).
+    } elsif ($userinput =~/^autoinstcodeformat:/) {
+	if (isClient) {
+	    my $reply;
+	    my($cmd,$cdom,$course) = split(/:/,$userinput);
+	    my @pairs = split/\&/,$course;
+	    my %instcodes = ();
+	    my %codes = ();
+	    my @codetitles = ();
+	    my %cat_titles = ();
+	    my %cat_order = ();
+	    foreach (@pairs) {
+		my ($key,$value) = split/=/,$_;
+		$instcodes{&unescape($key)} = &unescape($value);
+	    }
+	    my $formatreply = &localenroll::instcode_format($cdom,\%instcodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+	    if ($formatreply eq 'ok') {
+		my $codes_str = &hash2str(%codes);
+		my $codetitles_str = &array2str(@codetitles);
+		my $cat_titles_str = &hash2str(%cat_titles);
+		my $cat_order_str = &hash2str(%cat_order);
+		print $client $codes_str.':'.$codetitles_str.':'.$cat_titles_str.':'.$cat_order_str."\n";
+	    }
+	} else {
+	    print $client "refused\n";
+	}
+# ------------------------------------------------------------- unknown command
+	
+    } else {
+	# unknown command
+	print $client "unknown_cmd\n";
+    }
+# -------------------------------------------------------------------- complete
+    Debug("process_request - returning 1");
+    return 1;
+}
 #
 #   Decipher encoded traffic
 #  Parameters:
@@ -1073,11 +2937,11 @@ sub GetRequest {
 #  Implicit input:
 #     cipher  - This global holds the negotiated encryption key.
 #
-sub Decipher {
+sub decipher {
     my ($input)  = @_;
     my $output = '';
-   
-   
+    
+    
     if($cipher) {
 	my($enc, $enclength, $encinput) = split(/:/, $input);
 	for(my $encidx = 0; $encidx < length($encinput); $encidx += 16) {
@@ -1117,12 +2981,8 @@ sub Decipher {
 #      - On failure, the program will die as it's a bad internal bug to try to 
 #        register a duplicate command handler.
 #
-sub RegisterHandler {
-    my ($request_name,
-	$procedure,
-	$must_encode,
-	$client_ok,
-	$manager_ok)   = @_;
+sub register_handler {
+    my ($request_name,$procedure,$must_encode,	$client_ok,$manager_ok)   = @_;
 
     #  Don't allow duplication#
    
@@ -1400,14 +3260,16 @@ sub checkchildren {
     &logthis('Going to check on the children');
     my $docdir=$perlvar{'lonDocRoot'};
     foreach (sort keys %children) {
-	sleep 1;
+	#sleep 1;
         unless (kill 'USR1' => $_) {
 	    &logthis ('Child '.$_.' is dead');
             &logstatus($$.' is dead');
+	    delete($children{$_});
         } 
     }
     sleep 5;
-    $SIG{ALRM} = sub { die "timeout" };
+    $SIG{ALRM} = sub { Debug("timeout"); 
+		       die "timeout";  };
     $SIG{__DIE__} = 'DEFAULT';
     &status("Checking on the children (waiting for reports)");
     foreach (sort keys %children) {
@@ -1421,6 +3283,7 @@ sub checkchildren {
 	    #my $result=`echo 'Killed lond process $_.' | mailto $emailto -s '$subj' > /dev/null`;
 	    #$execdir=$perlvar{'lonDaemons'};
 	    #$result=`/bin/cp $execdir/logs/lond.log $execdir/logs/lond.log.$_`;
+	    delete($children{$_});
 	    alarm(0);
 	  }
         }
@@ -1428,6 +3291,7 @@ sub checkchildren {
     $SIG{ALRM} = 'DEFAULT';
     $SIG{__DIE__} = \&catchexception;
     &status("Finished checking children");
+    &logthis('Finished Checking children');
 }
 
 # --------------------------------------------------------------------- Logging
@@ -1459,12 +3323,38 @@ sub Debug {
 #     request - Original request from client.
 #
 sub Reply {
-
     my ($fd, $reply, $request) = @_;
-
     print $fd $reply;
     Debug("Request was $request  Reply was $reply");
 
+    $Transactions++;
+
+
+}
+
+
+#
+#    Sub to report a failure.
+#    This function:
+#     -   Increments the failure statistic counters.
+#     -   Invokes Reply to send the error message to the client.
+# Parameters:
+#    fd       - File descriptor open on the client
+#    reply    - Reply text to emit.
+#    request  - The original request message (used by Reply
+#               to debug if that's enabled.
+# Implicit outputs:
+#    $Failures- The number of failures is incremented.
+#    Reply (invoked here) sends a message to the 
+#    client:
+#
+sub Failure {
+    my $fd      = shift;
+    my $reply   = shift;
+    my $request = shift;
+   
+    $Failures++;
+    Reply($fd, $reply, $request);      # That's simple eh?
 }
 # ------------------------------------------------------------------ Log status
 
@@ -1472,17 +3362,19 @@ sub logstatus {
     &status("Doing logging");
     my $docdir=$perlvar{'lonDocRoot'};
     {
-    my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
-    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."\n$keymode";
         $fh->close();
     }
+    &status("Finished $$.txt");
+    {
+	open(LOG,">>$docdir/lon-status/londstatus.txt");
+	flock(LOG,LOCK_EX);
+	print LOG $$."\t".$clientname."\t".$currenthostid."\t"
+	    .$status."\t".$lastlog."\t $keymode\n";
+	flock(DB,LOCK_UN);
+	close(LOG);
+    }
     &status("Finished logging");
 }
 
@@ -1797,8 +3689,7 @@ sub make_new_child {
 			$inittype = ""; # This forces insecure attempt.
 			&logthis("<font color=\"blue\"> Certificates not "
 				 ."installed -- trying insecure auth</font>");
-		    }
-		    else {	# SSL certificates are in place so
+		    } else {	# SSL certificates are in place so
 		    }		# Leave the inittype alone.
 		}
 
@@ -1877,1645 +3768,24 @@ sub make_new_child {
 	    &logthis("<font color='green'>Established connection: $clientname</font>");
 	    &status('Will listen to '.$clientname);
 # ------------------------------------------------------------ Process requests
-	    while (my $userinput=<$client>) {
-                chomp($userinput);
-		Debug("Request = $userinput\n");
-                &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))
-						 );
-			}
-			$userinput=substr($userinput,0,$cmdlength);
-			$wasenc=1;
-		    }
-		}
-		
-# ------------------------------------------------------------- Normal commands
-# ------------------------------------------------------------------------ ping
-		if ($userinput =~ /^ping/) {	# client only
-		    if(isClient) {
-			print $client "$currenthostid\n";
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		    }
-# ------------------------------------------------------------------------ pong
-		}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/) { # 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/) { # 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/) { # 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)  && 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/) { # 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 {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ---------------------------------------------------------------------- passwd
-		} 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/) { # 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/) { # 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/) { # 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/) { # 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/) { # 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/) { # 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/) {
-		    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/) {
-		    if(isClient) {
-			print $client &subscribe($userinput,$clientip);
-		    } else {
-			Reply($client, "refused\n", $userinput);
-
-		    }
-# ------------------------------------------------------------- current version
-		} 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/) {
-		    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/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace,$what,@extras)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			if ($namespace ne 'roles') {
-                            if (@extras) {
-                                $what .= ':'.join(':',@extras);
-                            }
-			    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/) {
-		    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/) {
-		    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/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace,$what)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			chomp($what);
-			my @queries=split(/\&/,$what);
-			my $proname=propath($udom,$uname);
-			my $qresult='';
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
-			    for (my $i=0;$i<=$#queries;$i++) {
-				$qresult.="$hash{$queries[$i]}&";
-			    }
-			    if (untie(%hash)) {
-				$qresult=~s/\&$//;
-				print $client "$qresult\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting get\n";
-			    }
-			} else {
-			    if ($!+0 == 2) {
-				print $client "error:No such file or ".
-				    "GDBM reported bad block error\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." tie(GDBM) Failed ".
-				    "while attempting get\n";
-			    }
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ------------------------------------------------------------------------ eget
-		} elsif ($userinput =~ /^eget/) {
-		    if (isClient) {
-			my ($cmd,$udom,$uname,$namespace,$what)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			chomp($what);
-			my @queries=split(/\&/,$what);
-			my $proname=propath($udom,$uname);
-			my $qresult='';
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
-			    for (my $i=0;$i<=$#queries;$i++) {
-				$qresult.="$hash{$queries[$i]}&";
-			    }
-			    if (untie(%hash)) {
-				$qresult=~s/\&$//;
-				if ($cipher) {
-				    my $cmdlength=length($qresult);
-				    $qresult.="         ";
-				    my $encqresult='';
-				    for 
-					(my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
-					    $encqresult.=
-						unpack("H16",
-						       $cipher->encrypt(substr($qresult,$encidx,8)));
-					}
-				    print $client "enc:$cmdlength:$encqresult\n";
-				} else {
-				    print $client "error:no_key\n";
-				}
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting eget\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting eget\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		    
-		    }
-# ------------------------------------------------------------------------- del
-		} elsif ($userinput =~ /^del/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace,$what)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			chomp($what);
-			my $proname=propath($udom,$uname);
-			my $now=time;
-			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/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			my $proname=propath($udom,$uname);
-			my $qresult='';
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
-			    foreach my $key (keys %hash) {
-				$qresult.="$key&";
-			    }
-			    if (untie(%hash)) {
-				$qresult=~s/\&$//;
-				print $client "$qresult\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting keys\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting keys\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		   
-		    }
-# ----------------------------------------------------------------- dumpcurrent
-		} elsif ($userinput =~ /^currentdump/) {
-		    if (isClient) {
-			my ($cmd,$udom,$uname,$namespace)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			my $qresult='';
-			my $proname=propath($udom,$uname);
-			my %hash;
-			if (tie(%hash,'GDBM_File',
-				"$proname/$namespace.db",
-				&GDBM_READER(),0640)) {
-			    # Structure of %data:
-			    # $data{$symb}->{$parameter}=$value;
-			    # $data{$symb}->{'v.'.$parameter}=$version;
-			    # since $parameter will be unescaped, we do not
-			    # have to worry about silly parameter names...
-			    my %data = ();
-			    while (my ($key,$value) = each(%hash)) {
-				my ($v,$symb,$param) = split(/:/,$key);
-				next if ($v eq 'version' || $symb eq 'keys');
-				next if (exists($data{$symb}) && 
-					 exists($data{$symb}->{$param}) &&
-					 $data{$symb}->{'v.'.$param} > $v);
-				$data{$symb}->{$param}=$value;
-				$data{$symb}->{'v.'.$param}=$v;
-			    }
-			    if (untie(%hash)) {
-				while (my ($symb,$param_hash) = each(%data)) {
-				    while(my ($param,$value) = each (%$param_hash)){
-					next if ($param =~ /^v\./);
-					$qresult.=$symb.':'.$param.'='.$value.'&';
-				    }
-				}
-				chop($qresult);
-				print $client "$qresult\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting currentdump\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting currentdump\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		    }
-# ------------------------------------------------------------------------ dump
-		} elsif ($userinput =~ /^dump/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace,$regexp)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			if (defined($regexp)) {
-			    $regexp=&unescape($regexp);
-			} else {
-			    $regexp='.';
-			}
-			my $qresult='';
-			my $proname=propath($udom,$uname);
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
-			       while (my ($key,$value) = each(%hash)) {
-				   if ($regexp eq '.') {
-				       $qresult.=$key.'='.$value.'&';
-				   } else {
-				       my $unescapeKey = &unescape($key);
-				       if (eval('$unescapeKey=~/$regexp/')) {
-					   $qresult.="$key=$value&";
-				       }
-				   }
-			       }
-			       if (untie(%hash)) {
-				   chop($qresult);
-				   print $client "$qresult\n";
-			       } else {
-				   print $client "error: ".($!+0)
-				       ." untie(GDBM) Failed ".
-                                       "while attempting dump\n";
-			       }
-			   } else {
-			       print $client "error: ".($!+0)
-				   ." tie(GDBM) Failed ".
-				   "while attempting dump\n";
-			   }
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		 
-		    }
-# ----------------------------------------------------------------------- store
-		} elsif ($userinput =~ /^store/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace,$rid,$what)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			if ($namespace ne 'roles') {
-			    chomp($what);
-			    my $proname=propath($udom,$uname);
-			    my $now=time;
-			    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/) {
-		    if(isClient) {
-			my ($cmd,$udom,$uname,$namespace,$rid)
-			    =split(/:/,$userinput);
-			$namespace=~s/\//\_/g;
-			$namespace=~s/\W//g;
-			chomp($rid);
-			my $proname=propath($udom,$uname);
-			my $qresult='';
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname/$namespace.db",&GDBM_READER(),0640)) {
-			    my $version=$hash{"version:$rid"};
-			    $qresult.="version=$version&";
-			    my $scope;
-			    for ($scope=1;$scope<=$version;$scope++) {
-				my $vkeys=$hash{"$scope:keys:$rid"};
-				my @keys=split(/:/,$vkeys);
-				my $key;
-				$qresult.="$scope:keys=$vkeys&";
-				foreach $key (@keys) {
-				    $qresult.="$scope:$key=".$hash{"$scope:$rid:$key"}."&";
-				}                                  
-			    }
-			    if (untie(%hash)) {
-				$qresult=~s/\&$//;
-				print $client "$qresult\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting restore\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting restore\n";
-			}
-		    } else  {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# -------------------------------------------------------------------- chatsend
-		} elsif ($userinput =~ /^chatsend/) {
-		    if(isClient) {
-			my ($cmd,$cdom,$cnum,$newpost)=split(/\:/,$userinput);
-			&chatadd($cdom,$cnum,$newpost);
-			print $client "ok\n";
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		      
-		    }
-# -------------------------------------------------------------------- chatretr
-		} elsif ($userinput =~ /^chatretr/) {
-		    if(isClient) {
-			my 
-			    ($cmd,$cdom,$cnum,$udom,$uname)=split(/\:/,$userinput);
-			my $reply='';
-			foreach (&getchat($cdom,$cnum,$udom,$uname)) {
-			    $reply.=&escape($_).':';
-			}
-			$reply=~s/\:$//;
-			print $client $reply."\n";
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ------------------------------------------------------------------- querysend
-		} elsif ($userinput =~ /^querysend/) {
-		    if (isClient) {
-			my ($cmd,$query,
-			    $arg1,$arg2,$arg3)=split(/\:/,$userinput);
-			$query=~s/\n*$//g;
-			print $client "".
-			    sqlreply("$clientname\&$query".
-				     "\&$arg1"."\&$arg2"."\&$arg3")."\n";
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		      
-		    }
-# ------------------------------------------------------------------ queryreply
-		} elsif ($userinput =~ /^queryreply/) {
-		    if(isClient) {
-			my ($cmd,$id,$reply)=split(/:/,$userinput); 
-			my $store;
-			my $execdir=$perlvar{'lonDaemons'};
-			if ($store=IO::File->new(">$execdir/tmp/$id")) {
-			    $reply=~s/\&/\n/g;
-			    print $store $reply;
-			    close $store;
-			    my $store2=IO::File->new(">$execdir/tmp/$id.end");
-			    print $store2 "done\n";
-			    close $store2;
-			    print $client "ok\n";
-			}
-			else {
-			    print $client "error: ".($!+0)
-				." IO::File->new Failed ".
-				"while attempting queryreply\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		     
-		    }
-# ----------------------------------------------------------------- courseidput
-		} elsif ($userinput =~ /^courseidput/) {
-		    if(isClient) {
-			my ($cmd,$udom,$what)=split(/:/,$userinput);
-			chomp($what);
-			$udom=~s/\W//g;
-			my $proname=
-			    "$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
-			my $now=time;
-			my @pairs=split(/\&/,$what);
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_WRCREAT(),0640)) {
-			    foreach my $pair (@pairs) {
-				my ($key,$descr,$inst_code)=split(/=/,$pair);
-				$hash{$key}=$descr.':'.$inst_code.':'.$now;
-			    }
-			    if (untie(%hash)) {
-				print $client "ok\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting courseidput\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting courseidput\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ---------------------------------------------------------------- courseiddump
-		} elsif ($userinput =~ /^courseiddump/) {
-		    if(isClient) {
-			my ($cmd,$udom,$since,$description)
-			    =split(/:/,$userinput);
-			if (defined($description)) {
-			    $description=&unescape($description);
-			} else {
-			    $description='.';
-			}
-			unless (defined($since)) { $since=0; }
-			my $qresult='';
-			my $proname=
-			    "$perlvar{'lonUsersDir'}/$udom/nohist_courseids";
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
-			    while (my ($key,$value) = each(%hash)) {
-                                my ($descr,$lasttime,$inst_code);
-                                if ($value =~ m/^([^\:]*):([^\:]*):(\d+)$/) {
-				    ($descr,$inst_code,$lasttime)=($1,$2,$3);
-                                } else {
-                                    ($descr,$lasttime) = split(/\:/,$value);
-                                }
-				if ($lasttime<$since) { next; }
-				if ($description eq '.') {
-				    $qresult.=$key.'='.$descr.':'.$inst_code.'&';
-				} else {
-				    my $unescapeVal = &unescape($descr);
-				    if (eval('$unescapeVal=~/\Q$description\E/i')) {
-					$qresult.=$key.'='.$descr.':'.$inst_code.'&';
-				    }
-				}
-			    }
-			    if (untie(%hash)) {
-				chop($qresult);
-				print $client "$qresult\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting courseiddump\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting courseiddump\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ----------------------------------------------------------------------- idput
-		} elsif ($userinput =~ /^idput/) {
-		    if(isClient) {
-			my ($cmd,$udom,$what)=split(/:/,$userinput);
-			chomp($what);
-			$udom=~s/\W//g;
-			my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
-			my $now=time;
-			{
-			    my $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/) {
-		    if(isClient) {
-			my ($cmd,$udom,$what)=split(/:/,$userinput);
-			chomp($what);
-			$udom=~s/\W//g;
-			my $proname="$perlvar{'lonUsersDir'}/$udom/ids";
-			my @queries=split(/\&/,$what);
-			my $qresult='';
-			my %hash;
-			if (tie(%hash,'GDBM_File',"$proname.db",&GDBM_READER(),0640)) {
-			    for (my $i=0;$i<=$#queries;$i++) {
-				$qresult.="$hash{$queries[$i]}&";
-			    }
-			    if (untie(%hash)) {
-				$qresult=~s/\&$//;
-				print $client "$qresult\n";
-			    } else {
-				print $client "error: ".($!+0)
-				    ." untie(GDBM) Failed ".
-				    "while attempting idget\n";
-			    }
-			} else {
-			    print $client "error: ".($!+0)
-				." tie(GDBM) Failed ".
-				"while attempting idget\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ---------------------------------------------------------------------- tmpput
-		} elsif ($userinput =~ /^tmpput/) {
-		    if(isClient) {
-			my ($cmd,$what)=split(/:/,$userinput);
-			my $store;
-			$tmpsnum++;
-			my $id=$$.'_'.$clientip.'_'.$tmpsnum;
-			$id=~s/\W/\_/g;
-			$what=~s/\n//g;
-			my $execdir=$perlvar{'lonDaemons'};
-			if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
-			    print $store $what;
-			    close $store;
-			    print $client "$id\n";
-			}
-			else {
-			    print $client "error: ".($!+0)
-				."IO::File->new Failed ".
-				"while attempting tmpput\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		    
-		    }
-		    
-# ---------------------------------------------------------------------- tmpget
-		} elsif ($userinput =~ /^tmpget/) {
-		    if(isClient) {
-			my ($cmd,$id)=split(/:/,$userinput);
-			chomp($id);
-			$id=~s/\W/\_/g;
-			my $store;
-			my $execdir=$perlvar{'lonDaemons'};
-			if ($store=IO::File->new("$execdir/tmp/$id.tmp")) {
-			    my $reply=<$store>;
-			    print $client "$reply\n";
-			    close $store;
-			}
-			else {
-			    print $client "error: ".($!+0)
-				."IO::File->new Failed ".
-				"while attempting tmpget\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		      
-		    }
-# ---------------------------------------------------------------------- tmpdel
-		} elsif ($userinput =~ /^tmpdel/) {
-		    if(isClient) {
-			my ($cmd,$id)=split(/:/,$userinput);
-			chomp($id);
-			$id=~s/\W/\_/g;
-			my $execdir=$perlvar{'lonDaemons'};
-			if (unlink("$execdir/tmp/$id.tmp")) {
-			    print $client "ok\n";
-			} else {
-			    print $client "error: ".($!+0)
-				."Unlink tmp Failed ".
-				"while attempting tmpdel\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		     
-		    }
-# ----------------------------------------- portfolio directory list (portls)
-                } elsif ($userinput =~ /^portls/) {
-                    if(isClient) {
-                        my ($cmd,$uname,$udom)=split(/:/,$userinput);
-                        my $udir=propath($udom,$uname).'/userfiles/portfolio';
-                        my $dirLine='';
-                        my $dirContents='';
-                        if (opendir(LSDIR,$udir.'/')){
-                            while ($dirLine = readdir(LSDIR)){
-                                $dirContents = $dirContents.$dirLine.'<br />';
-                            }
-                        } else {
-                            $dirContents = "No directory found\n";
-                        }
-                        print $client $dirContents."\n";
-                    } else {
-                        Reply($client, "refused\n", $userinput);
-                    }
-# -------------------------------------------------------------------------- ls
-		} elsif ($userinput =~ /^ls/) {
-		    if(isClient) {
-			my $obs;
-			my $rights;
-			my ($cmd,$ulsdir)=split(/:/,$userinput);
-			my $ulsout='';
-			my $ulsfn;
-			if (-e $ulsdir) {
-			    if(-d $ulsdir) {
-				if (opendir(LSDIR,$ulsdir)) {
-				    while ($ulsfn=readdir(LSDIR)) {
-					undef $obs, $rights; 
-					my @ulsstats=stat($ulsdir.'/'.$ulsfn);
-					#We do some obsolete checking here
-					if(-e $ulsdir.'/'.$ulsfn.".meta") { 
-					    open(FILE, $ulsdir.'/'.$ulsfn.".meta");
-					    my @obsolete=<FILE>;
-					    foreach my $obsolete (@obsolete) {
-					        if($obsolete =~ m|(<obsolete>)(on)|) { $obs = 1; } 
-						if($obsolete =~ m|(<copyright>)(default)|) { $rights = 1; }
-					    }
-					}
-					$ulsout.=$ulsfn.'&'.join('&',@ulsstats);
-					if($obs eq '1') { $ulsout.="&1"; }
-					else { $ulsout.="&0"; }
-					if($rights eq '1') { $ulsout.="&1:"; }
-					else { $ulsout.="&0:"; }
-				    }
-				    closedir(LSDIR);
-				}
-			    } else {
-				my @ulsstats=stat($ulsdir);
-				$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
-			    }
-			} else {
-			    $ulsout='no_such_dir';
-			}
-			if ($ulsout eq '') { $ulsout='empty'; }
-			print $client "$ulsout\n";
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		     
-		    }
-# ----------------------------------------------------------------- setannounce
-		} elsif ($userinput =~ /^setannounce/) {
-		    if (isClient) {
-			my ($cmd,$announcement)=split(/:/,$userinput);
-			chomp($announcement);
-			$announcement=&unescape($announcement);
-			if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
-						    '/announcement.txt')) {
-			    print $store $announcement;
-			    close $store;
-			    print $client "ok\n";
-			} else {
-			    print $client "error: ".($!+0)."\n";
-			}
-		    } else {
-			Reply($client, "refused\n", $userinput);
-		       
-		    }
-# ------------------------------------------------------------------ Hanging up
-		} elsif (($userinput =~ /^exit/) ||
-			 ($userinput =~ /^init/)) { # no restrictions.
-		    &logthis(
-			     "Client $clientip ($clientname) hanging up: $userinput");
-		    print $client "bye\n";
-		    $client->shutdown(2);        # shutdown the socket forcibly.
-		    $client->close();
-		    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";
-                    }
-#---------------------  read and retrieve institutional code format (for support form).
-                } elsif ($userinput =~/^autoinstcodeformat:/) {
-                    if (isClient) {
-                        my $reply;
-                        my($cmd,$cdom,$course) = split(/:/,$userinput);
-                        my @pairs = split/\&/,$course;
-                        my %instcodes = ();
-                        my %codes = ();
-                        my @codetitles = ();
-                        my %cat_titles = ();
-                        my %cat_order = ();
-                        foreach (@pairs) {
-                            my ($key,$value) = split/=/,$_;
-                            $instcodes{&unescape($key)} = &unescape($value);
-                        }
-                        my $formatreply = &localenroll::instcode_format($cdom,\%instcodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
-                        if ($formatreply eq 'ok') {
-                            my $codes_str = &hash2str(%codes);
-                            my $codetitles_str = &array2str(@codetitles);
-                            my $cat_titles_str = &hash2str(%cat_titles);
-                            my $cat_order_str = &hash2str(%cat_order);
-                            print $client $codes_str.':'.$codetitles_str.':'.$cat_titles_str.':'.$cat_order_str."\n";
-                        }
-                    } else {
-                        print $client "refused\n";
-                    }
-# ------------------------------------------------------------- unknown command
-
-		} else {
-		    # unknown command
-		    print $client "unknown_cmd\n";
-		}
-# -------------------------------------------------------------------- complete
+	    my $keep_going = 1;
+	    my $user_input;
+	    while(($user_input = get_request) && $keep_going) {
+		alarm(120);
+		Debug("Main: Got $user_input\n");
+		$keep_going = &process_request($user_input);
 		alarm(0);
-		&status('Listening to '.$clientname." ($keymode)");
+		&status('Listening to '.$clientname." ($keymode)");	   
 	    }
+
 # --------------------------------------------- client unknown or fishy, refuse
-	} else {
+	}  else {
 	    print $client "refused\n";
 	    $client->close();
 	    &logthis("<font color='blue'>WARNING: "
 		     ."Rejected client $clientip, closing connection</font>");
 	}
-    }             
+    }            
     
 # =============================================================================
     
@@ -3555,17 +3825,89 @@ sub ManagePermissions
 	system("$execdir/lchtmldir $userhome $user $authtype");
     }
 }
+
+
+#
+#  Return the full path of a user password file, whether it exists or not.
+# Parameters:
+#   domain     - Domain in which the password file lives.
+#   user       - name of the user.
+# Returns:
+#    Full passwd path:
+#
+sub password_path {
+    my ($domain, $user) = @_;
+
+
+    my $path   = &propath($domain, $user);
+    $path  .= "/passwd";
+
+    return $path;
+}
+
+#   Password Filename
+#   Returns the path to a passwd file given domain and user... only if
+#  it exists.
+# Parameters:
+#   domain    - Domain in which to search.
+#   user      - username.
+# Returns:
+#   - If the password file exists returns its path.
+#   - If the password file does not exist, returns undefined.
 #
-#   GetAuthType - Determines the authorization type of a user in a domain.
+sub password_filename {
+    my ($domain, $user) = @_;
+
+    Debug ("PasswordFilename called: dom = $domain user = $user");
+
+    my $path  = &password_path($domain, $user);
+    Debug("PasswordFilename got path: $path");
+    if(-e $path) {
+	return $path;
+    } else {
+	return undef;
+    }
+}
+
+#
+#   Rewrite the contents of the user's passwd file.
+#  Parameters:
+#    domain    - domain of the user.
+#    name      - User's name.
+#    contents  - New contents of the file.
+# Returns:
+#   0    - Failed.
+#   1    - Success.
+#
+sub rewrite_password_file {
+    my ($domain, $user, $contents) = @_;
+
+    my $file = &password_filename($domain, $user);
+    if (defined $file) {
+	my $pf = IO::File->new(">$file");
+	if($pf) {
+	    print $pf "$contents\n";
+	    return 1;
+	} else {
+	    return 0;
+	}
+    } else {
+	return 0;
+    }
+
+}
+
+#
+#   get_auth_type - Determines the authorization type of a user in a domain.
 
 #     Returns the authorization type or nouser if there is no such user.
 #
-sub GetAuthType 
+sub get_auth_type 
 {
 
     my ($domain, $user)  = @_;
 
-    Debug("GetAuthType( $domain, $user ) \n");
+    Debug("get_auth_type( $domain, $user ) \n");
     my $proname    = &propath($domain, $user); 
     my $passwdfile = "$proname/passwd";
     if( -e $passwdfile ) {
@@ -3581,13 +3923,132 @@ sub GetAuthType
 	}
 
 	return "$authtype:$availinfo";
-    }
-    else {
+    } else {
 	Debug("Returning nouser");
 	return "nouser";
     }
 }
 
+#
+#  Validate a user given their domain, name and password.  This utility
+#  function is used by both  AuthenticateHandler and ChangePasswordHandler
+#  to validate the login credentials of a user.
+# Parameters:
+#    $domain    - The domain being logged into (this is required due to
+#                 the capability for multihomed systems.
+#    $user      - The name of the user being validated.
+#    $password  - The user's propoposed password.
+#
+# Returns:
+#     1        - The domain,user,pasword triplet corresponds to a valid
+#                user.
+#     0        - The domain,user,password triplet is not a valid user.
+#
+sub validate_user {
+    my ($domain, $user, $password) = @_;
+
+
+    # Why negative ~pi you may well ask?  Well this function is about
+    # authentication, and therefore very important to get right.
+    # I've initialized the flag that determines whether or not I've 
+    # validated correctly to a value it's not supposed to get.
+    # At the end of this function. I'll ensure that it's not still that
+    # value so we don't just wind up returning some accidental value
+    # as a result of executing an unforseen code path that
+    # did not set $validated.
+
+    my $validated = -3.14159;
+
+    #  How we authenticate is determined by the type of authentication
+    #  the user has been assigned.  If the authentication type is
+    #  "nouser", the user does not exist so we will return 0.
+
+    my $contents = &get_auth_type($domain, $user);
+    my ($howpwd, $contentpwd) = split(/:/, $contents);
+
+    my $null = pack("C",0);	# Used by kerberos auth types.
+
+    if ($howpwd ne 'nouser') {
+
+	if($howpwd eq "internal") { # Encrypted is in local password file.
+	    $validated = (crypt($password, $contentpwd) eq $contentpwd);
+	}
+	elsif ($howpwd eq "unix") { # User is a normal unix user.
+	    $contentpwd = (getpwnam($user))[1];
+	    if($contentpwd) {
+		if($contentpwd eq 'x') { # Shadow password file...
+		    my $pwauth_path = "/usr/local/sbin/pwauth";
+		    open PWAUTH,  "|$pwauth_path" or
+			die "Cannot invoke authentication";
+		    print PWAUTH "$user\n$password\n";
+		    close PWAUTH;
+		    $validated = ! $?;
+
+		} else { 	         # Passwords in /etc/passwd. 
+		    $validated = (crypt($password,
+					$contentpwd) eq $contentpwd);
+		}
+	    } else {
+		$validated = 0;
+	    }
+	}
+	elsif ($howpwd eq "krb4") { # user is in kerberos 4 auth. domain.
+	    if(! ($password =~ /$null/) ) {
+		my $k4error = &Authen::Krb4::get_pw_in_tkt($user,
+							   "",
+							   $contentpwd,,
+							   'krbtgt',
+							   $contentpwd,
+							   1,
+							   $password);
+		if(!$k4error) {
+		    $validated = 1;
+		} else {
+		    $validated = 0;
+		    &logthis('krb4: '.$user.', '.$contentpwd.', '.
+			     &Authen::Krb4::get_err_txt($Authen::Krb4::error));
+		}
+	    } else {
+		$validated = 0; # Password has a match with null.
+	    }
+	} elsif ($howpwd eq "krb5") { # User is in kerberos 5 auth. domain.
+	    if(!($password =~ /$null/)) { # Null password not allowed.
+		my $krbclient = &Authen::Krb5::parse_name($user.'@'
+							  .$contentpwd);
+		my $krbservice = "krbtgt/".$contentpwd."\@".$contentpwd;
+		my $krbserver  = &Authen::Krb5::parse_name($krbservice);
+		my $credentials= &Authen::Krb5::cc_default();
+		$credentials->initialize($krbclient);
+		my $krbreturn  = &Authen::KRb5::get_in_tkt_with_password($krbclient,
+									 $krbserver,
+									 $password,
+									 $credentials);
+		$validated = ($krbreturn == 1);
+	    } else {
+		$validated = 0;
+	    }
+	} elsif ($howpwd eq "localauth") { 
+	    #  Authenticate via installation specific authentcation method:
+	    $validated = &localauth::localauth($user, 
+					       $password, 
+					       $contentpwd);
+	} else {			# Unrecognized auth is also bad.
+	    $validated = 0;
+	}
+    } else {
+	$validated = 0;
+    }
+    #
+    #  $validated has the correct stat of the authentication:
+    #
+
+    unless ($validated != -3.14159) {
+	die "ValidateUser - failed to set the value of validated";
+    }
+    return $validated;
+}
+
+
 sub addline {
     my ($fname,$hostid,$ip,$newline)=@_;
     my $contents;
@@ -3833,7 +4294,9 @@ sub make_passwd_file {
 		return "no_priv_account_error\n";
 	    }
 
-	    my $execpath="$perlvar{'lonDaemons'}/"."lcuseradd";
+	    my $execpath       ="$perlvar{'lonDaemons'}/"."lcuseradd";
+
+	    my $lc_error_file  = $execdir."/tmp/lcuseradd".$$.".status";
 	    {
 		&Debug("Executing external: ".$execpath);
 		&Debug("user  = ".$uname.", Password =". $npass);
@@ -3841,17 +4304,27 @@ sub make_passwd_file {
 		print $se "$uname\n";
 		print $se "$npass\n";
 		print $se "$npass\n";
+		print $se "$lc_error_file\n"; # Status -> unique file.
 	    }
-	    my $useraddok = $?;
+	    my $error = IO::File->new("< $lc_error_file");
+	    my $useraddok = <$error>;
+	    $error->close;
+	    unlink($lc_error_file);
+
+	    chomp $useraddok;
+
 	    if($useraddok > 0) {
-		&logthis("Failed lcuseradd: ".&lcuseraddstrerror($useraddok));
+		my $error_text = &lcuseraddstrerror($useraddok);
+		&logthis("Failed lcuseradd: $error_text");
+		$result = "lcuseradd_failed:$error_text\n";
+	    }  else {
+		my $pf = IO::File->new(">$passfilename");
+		print $pf "unix:\n";
 	    }
-	    my $pf = IO::File->new(">$passfilename");
-	    print $pf "unix:\n";
 	}
     } elsif ($umode eq 'none') {
 	{
-	    my $pf = IO::File->new(">$passfilename");
+	    my $pf = IO::File->new("> $passfilename");
 	    print $pf "none:\n";
 	}
     } else {