loncom/lond - diff - 1.489.2.34

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.370 and 1.489.2.34

-version 1.370, 2007/04/04 00:03:40
+version 1.489.2.34, 2020/01/13 03:46:32
  Line 33  use strict;
  use lib '/home/httpd/lib/perl/';
  use LONCAPA;
  use LONCAPA::Configuration;
- use Apache::lonnet;
+ use LONCAPA::Lond;
  use IO::Socket;
  use IO::File;
  Line 43  use Crypt::IDEA;
  use LWP::UserAgent();
  use Digest::MD5 qw(md5_hex);
  use GDBM_File;
- use Authen::Krb4;
  use Authen::Krb5;
  use localauth;
  use localenroll;
- Line 53  use File::Find;
+ Line 52  use File::Find;
  use LONCAPA::lonlocal;
  use LONCAPA::lonssl;
  use Fcntl qw(:flock);
+ use Apache::lonnet;
+ use Mail::Send;
+ use Crypt::Eksblowfish::Bcrypt;
+ use Digest::SHA;
+ use Encode;
  my $DEBUG = 0;		       # Non zero to enable debug log entries.
- Line 67  my $currentdomainid;
+ Line 71  my $currentdomainid;
  my $client;
  my $clientip;			# IP address of client.
  my $clientname;			# LonCAPA name of client.
+ my $clientversion;              # LonCAPA version running on client.
+ my $clienthomedom;              # LonCAPA domain of homeID for client.
+                                 # primary library server.
  my $server;
- my $thisserver;			# DNS of us.
  my $keymode;
- Line 89  my %managers;   # Ip -> manager names
+ Line 95  my %managers;   # Ip -> manager names
  my %perlvar;			# Will have the apache conf defined perl vars.
+ my $dist;
  #
  #   The hash below is used for command dispatching, and is therefore keyed on the request keyword.
  #    Each element of the hash contains a reference to an array that contains:
- Line 124  my @passwderrors = ("ok",
+ Line 132  my @passwderrors = ("ok",
  		   "pwchange_failure - lcpasswd Error filename is invalid");
- #  The array below are lcuseradd error strings.:
+ # This array are the errors from lcinstallfile:
- my $lastadderror = 13;
- my @adderrors    = ("ok",
- 		    "User ID mismatch, lcuseradd must run as user www",
- 		    "lcuseradd Incorrect number of command line parameters must be 3",
- 		    "lcuseradd Incorrect number of stdinput lines, must be 3",
- 		    "lcuseradd Too many other simultaneous pwd changes in progress",
- 		    "lcuseradd User does not exist",
- 		    "lcuseradd Unable to make www member of users's group",
- 		    "lcuseradd Unable to su to root",
- 		    "lcuseradd Unable to set password",
- 		    "lcuseradd Usrname has invalid characters",
- 		    "lcuseradd Password has an invalid character",
- 		    "lcuseradd User already exists",
- 		    "lcuseradd Could not add user.",
- 		    "lcuseradd Password mismatch");
+ my @installerrors = ("ok",
+ 		     "Initial user id of client not that of www",
+ 		     "Usage error, not enough command line arguments",
+ 		     "Source filename does not exist",
+ 		     "Destination filename does not exist",
+ 		     "Some file operation failed",
+ 		     "Invalid table filename."
+ 		     );
  #
  #   Statistics that are maintained and dislayed in the status line.
- Line 172  sub ResetStatistics {
+ Line 171  sub ResetStatistics {
  #   $Socket      - Socket open on client.
  #   $initcmd     - The full text of the init command.
  #
- # Implicit inputs:
- #    $thisserver - Our DNS name.
- #
  # Returns:
  #     IDEA session key on success.
  #     undef on failure.
  #
  sub LocalConnection {
      my ($Socket, $initcmd) = @_;
-     Debug("Attempting local connection: $initcmd client: $clientip me: $thisserver");
+     Debug("Attempting local connection: $initcmd client: $clientip");
      if($clientip ne "127.0.0.1") {
  	&logthis('<font color="red"> LocalConnection rejecting non local: '
- 		 ."$clientip ne $thisserver </font>");
+ 		 ."$clientip ne 127.0.0.1 </font>");
  	close $Socket;
  	return undef;
      }  else {
- Line 402  sub isClient {
+ Line 398  sub isClient {
  #
  sub ReadManagerTable {
+     &Debug("Reading manager table");
      #   Clean out the old table first..
     foreach my $key (keys %managers) {
- Line 410  sub ReadManagerTable {
+ Line 407  sub ReadManagerTable {
     my $tablename = $perlvar{'lonTabDir'}."/managers.tab";
     if (!open (MANAGERS, $tablename)) {
-       logthis('<font color="red">No manager table.  Nobody can manage!!</font>');
+        my $hostname = &Apache::lonnet::hostname($perlvar{'lonHostID'});
-       return;
+        if (&Apache::lonnet::is_LC_dns($hostname)) {
+            &logthis('<font color="red">No manager table.  Nobody can manage!!</font>');
+        }
+        return;
     }
     while(my $host = <MANAGERS>) {
        chomp($host);
  Line 436  sub ReadManagerTable {
           }
        } else {
           logthis('<font color="green"> existing host'." $host</font>\n");
-          $managers{&Apache::lonnet::get_host_ip($host)} = $host;  # Use info from cluster tab if clumemeber
+          $managers{&Apache::lonnet::get_host_ip($host)} = $host;  # Use info from cluster tab if cluster memeber
        }
     }
  }
  Line 498  sub AdjustHostContents {
      my $me        = $perlvar{'lonHostID'};
      foreach my $line (split(/\n/,$contents)) {
- 	if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/))) {
+ 	if(!(($line eq "") || ($line =~ /^ *\#/) || ($line =~ /^ *$/) ||
+              ($line =~ /^\s*\^/))) {
  	    chomp($line);
  	    my ($id,$domain,$role,$name,$ip,$maxcon,$idleto,$mincon)=split(/:/,$line);
  	    if ($id eq $me) {
- Line 524  sub AdjustHostContents {
+ Line 525  sub AdjustHostContents {
  }
  #
  #   InstallFile: Called to install an administrative file:
- #       - The file is created with <name>.tmp
+ #       - The file is created int a temp directory called <name>.tmp
- #       - The <name>.tmp file is then mv'd to <name>
+ #       - lcinstall file is called to install the file.
- #   This lugubrious procedure is done to ensure that we are never without
+ #         since the web app has no direct write access to the table directory
- #   a valid, even if dated, version of the file regardless of who crashes
- #   and when the crash occurs.
  #
  #  Parameters:
  #       Name of the file
- Line 536  sub AdjustHostContents {
+ Line 535  sub AdjustHostContents {
  #  Return:
  #      nonzero - success.
  #      0       - failure and $! has an errno.
+ # Assumptions:
+ #    File installtion is a relatively infrequent
  #
  sub InstallFile {
      my ($Filename, $Contents) = @_;
-     my $TempFile = $Filename.".tmp";
+ #     my $TempFile = $Filename.".tmp";
+     my $exedir = $perlvar{'lonDaemons'};
+     my $tmpdir = $exedir.'/tmp/';
+     my $TempFile = $tmpdir."TempTableFile.tmp";
      #  Open the file for write:
- Line 554  sub InstallFile {
+ Line 558  sub InstallFile {
      print $fh ($Contents);
      $fh->close;			# In case we ever have a filesystem w. locking
-     chmod(0660, $TempFile);
+     chmod(0664, $TempFile);	# Everyone can write it.
-     # Now we can move install the file in position.
+     # Use lcinstall file to put the file in the table directory...
-     move($TempFile, $Filename);
+     &Debug("Opening pipe to $exedir/lcinstallfile $TempFile $Filename");
+     my $pf = IO::File->new("| $exedir/lcinstallfile   $TempFile $Filename > $exedir/logs/lcinstallfile.log");
+     close $pf;
+     my $err = $?;
+     &Debug("Status is $err");
+     if ($err != 0) {
+ 	my $msg = $err;
+ 	if ($err < @installerrors) {
+ 	    $msg = $installerrors[$err];
+ 	}
+ 	&logthis("Install failed for table file $Filename : $msg");
+ 	return 0;
+     }
+     # Remove the temp file:
+     unlink($TempFile);
      return 1;
  }
- Line 566  sub InstallFile {
+ Line 586  sub InstallFile {
  #
  #   ConfigFileFromSelector: converts a configuration file selector
- #                 (one of host or domain at this point) into a
+ #                 into a configuration file pathname.
- #                 configuration file pathname.
+ #                 Supports the following file selectors:
+ #                 hosts, domain, dns_hosts, dns_domain
+ #
  #
  #  Parameters:
  #      selector  - Configuration file selector.
- Line 579  sub ConfigFileFromSelector {
+ Line 601  sub ConfigFileFromSelector {
      my $tablefile;
      my $tabledir = $perlvar{'lonTabDir'}.'/';
-     if ($selector eq "hosts") {
+     if (($selector eq "hosts") || ($selector eq "domain") ||
- 	$tablefile = $tabledir."hosts.tab";
+         ($selector eq "dns_hosts") || ($selector eq "dns_domain")) {
-     } elsif ($selector eq "domain") {
+ 	$tablefile =  $tabledir.$selector.'.tab';
- 	$tablefile = $tabledir."domain.tab";
-     } else {
- 	return undef;
      }
      return $tablefile;
  }
  #
  #   PushFile:  Called to do an administrative push of a file.
- Line 605  sub ConfigFileFromSelector {
+ Line 623  sub ConfigFileFromSelector {
  #     String to send to client ("ok" or "refused" if bad file).
  #
  sub PushFile {
      my $request = shift;
      my ($command, $filename, $contents) = split(":", $request, 3);
+     &Debug("PushFile");
      #  At this point in time, pushes for only the following tables are
      #  supported:
      #   hosts.tab  ($filename eq host).
      #   domain.tab ($filename eq domain).
+     #   dns_hosts.tab ($filename eq dns_host).
+     #   dns_domain.tab ($filename eq dns_domain).
      # Construct the destination filename or reject the request.
      #
      # lonManage is supposed to ensure this, however this session could be
- Line 623  sub PushFile {
+ Line 644  sub PushFile {
      if(! (defined $tablefile)) {
  	return "refused";
      }
-     #
-     # >copy< the old table to the backup table
-     #        don't rename in case system crashes/reboots etc. in the time
-     #        window between a rename and write.
-     #
-     my $backupfile = $tablefile;
-     $backupfile    =~ s/\.tab$/.old/;
-     if(!CopyFile($tablefile, $backupfile)) {
- 	&logthis('<font color="green"> CopyFile from '.$tablefile." to ".$backupfile." failed </font>");
- 	return "error:$!";
-     }
-     &logthis('<font color="green"> Pushfile: backed up '
- 	    .$tablefile." to $backupfile</font>");
      #  If the file being pushed is the host file, we adjust the entry for ourself so that the
      #  IP will be our current IP as looked up in dns.  Note this is only 99% good as it's possible
      #  to conceive of conditions where we don't have a DNS entry locally.  This is possible in a
- Line 645  sub PushFile {
+ Line 653  sub PushFile {
      if($filename eq "host") {
  	$contents = AdjustHostContents($contents);
+     } elsif ($filename eq 'dns_host' || $filename eq 'dns_domain') {
+         if ($contents eq '') {
+             &logthis('<font color="red"> Pushfile: unable to install '
+                     .$tablefile." - no data received from push. </font>");
+             return 'error: push had no data';
+         }
+         if (&Apache::lonnet::get_host_ip($clientname)) {
+             my $clienthost = &Apache::lonnet::hostname($clientname);
+             if ($managers{$clientip} eq $clientname) {
+                 my $clientprotocol = $Apache::lonnet::protocol{$clientname};
+                 $clientprotocol = 'http' if ($clientprotocol ne 'https');
+                 my $url = '/adm/'.$filename;
+                 $url =~ s{_}{/};
+                 my $ua=new LWP::UserAgent;
+                 $ua->timeout(60);
+                 my $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url");
+                 my $response=$ua->request($request);
+                 if ($response->is_error()) {
+                     &logthis('<font color="red"> Pushfile: unable to install '
+                             .$tablefile." - error attempting to pull data. </font>");
+                     return 'error: pull failed';
+                 } else {
+                     my $result = $response->content;
+                     chomp($result);
+                     unless ($result eq $contents) {
+                         &logthis('<font color="red"> Pushfile: unable to install '
+                                 .$tablefile." - pushed data and pulled data differ. </font>");
+                         my $pushleng = length($contents);
+                         my $pullleng = length($result);
+                         if ($pushleng != $pullleng) {
+                             return "error: $pushleng vs $pullleng bytes";
+                         } else {
+                             return "error: mismatch push and pull";
+                         }
+                     }
+                 }
+             }
+         }
      }
      #  Install the new file:
+     &logthis("Installing new $tablefile contents:\n$contents");
      if(!InstallFile($tablefile, $contents)) {
  	&logthis('<font color="red"> Pushfile: unable to install '
  	 .$tablefile." $! </font>");
  	return "error:$!";
      } else {
  	&logthis('<font color="green"> Installed new '.$tablefile
- 		 ."</font>");
+ 		 ." - transaction by: $clientname ($clientip)</font>");
+         my $adminmail = $perlvar{'lonAdmEMail'};
+         my $admindom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
+         if ($admindom ne '') {
+             my %domconfig =
+                 &Apache::lonnet::get_dom('configuration',['contacts'],$admindom);
+             if (ref($domconfig{'contacts'}) eq 'HASH') {
+                 if ($domconfig{'contacts'}{'adminemail'} ne '') {
+                     $adminmail = $domconfig{'contacts'}{'adminemail'};
+                 }
+             }
+         }
+         if ($adminmail =~ /^[^\@]+\@[^\@]+$/) {
+             my $msg = new Mail::Send;
+             $msg->to($adminmail);
+             $msg->subject('LON-CAPA DNS update on '.$perlvar{'lonHostID'});
+             $msg->add('Content-type','text/plain; charset=UTF-8');
+             if (my $fh = $msg->open()) {
+                 print $fh 'Update to '.$tablefile.' from Cluster Manager '.
+                           "$clientname ($clientip)\n";
+                 $fh->close;
+             }
+         }
      }
      #  Indicate success:
      return "ok";
- Line 955  sub read_profile {
+ Line 1022  sub read_profile {
  				 &GDBM_READER());
      if ($hashref) {
          my @queries=split(/\&/,$what);
+         if ($namespace eq 'roles') {
+             @queries = map { &unescape($_); } @queries;
+         }
          my $qresult='';
  	for (my $i=0;$i<=$#queries;$i++) {
- Line 1000  sub ping_handler {
+ Line 1070  sub ping_handler {
      my ($cmd, $tail, $client) = @_;
      Debug("$cmd $tail $client .. $currenthostid:");
-     Reply( $client,"$currenthostid\n","$cmd:$tail");
+     Reply( $client,\$currenthostid,"$cmd:$tail");
      return 1;
  }
- Line 1048  sub pong_handler {
+ Line 1118  sub pong_handler {
  #  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.
+ #      $clientname    - Global variable that carries the name of the host we're connected to.
  #  Returns:
  #      1       - Ok to continue processing.
  #      0       - Program should exit.
- Line 1070  sub establish_key_handler {
+ Line 1140  sub establish_key_handler {
      $key=substr($key,0,32);
      my $cipherkey=pack("H32",$key);
      $cipher=new IDEA $cipherkey;
-     &Reply($replyfd, "$buildkey\n", "$cmd:$tail");
+     &Reply($replyfd, \$buildkey, "$cmd:$tail");
      return 1;
- Line 1087  sub establish_key_handler {
+ Line 1157  sub establish_key_handler {
  #  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.
+ #      $clientname    - Global variable that carries the name of the host we're connected to.
  #  Returns:
  #      1       - Ok to continue processing.
  #      0       - Program should exit.
- Line 1096  sub establish_key_handler {
+ Line 1166  sub establish_key_handler {
  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
- Line 1107  sub load_handler {
+ Line 1179  sub load_handler {
      my $loadpercent=100*$loadavg/$perlvar{'lonLoadLim'};
-     &Reply( $replyfd, "$loadpercent\n", "$cmd:$tail");
+     &Reply( $replyfd, \$loadpercent, "$cmd:$tail");
      return 1;
  }
- Line 1124  sub load_handler {
+ Line 1196  sub load_handler {
  #  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.
+ #      $clientname    - Global variable that carries the name of the host we're connected to.
  #  Returns:
  #      1       - Ok to continue processing.
  #      0       - Program should exit
- Line 1137  sub user_load_handler {
+ Line 1209  sub user_load_handler {
      my ($cmd, $tail, $replyfd) = @_;
      my $userloadpercent=&Apache::lonnet::userload();
-     &Reply($replyfd, "$userloadpercent\n", "$cmd:$tail");
+     &Reply($replyfd, \$userloadpercent, "$cmd:$tail");
      return 1;
  }
- Line 1180  sub user_authorization_type {
+ Line 1252  sub user_authorization_type {
  	} else {
              $type .= ':';
          }
- 	&Reply( $replyfd, "$type\n", $userinput);
+ 	&Reply( $replyfd, \$type, $userinput);
      }
      return 1;
- Line 1202  sub user_authorization_type {
+ Line 1274  sub user_authorization_type {
  #    a reply is written to the client.
  sub push_file_handler {
      my ($cmd, $tail, $client) = @_;
+     &Debug("In push file handler");
      my $userinput = "$cmd:$tail";
      # At this time we only know that the IP of our partner is a valid manager
- Line 1210  sub push_file_handler {
+ Line 1282  sub push_file_handler {
      # spoofing).
      my $cert = &GetCertificate($userinput);
      if(&ValidManager($cert)) {
+ 	&Debug("Valid manager: $client");
  	# 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);
+ 	&Reply($client, \$reply, $userinput);
      } else {
+ 	&logthis("push_file_handler $client is not valid");
  	&Failure( $client, "refused\n", $userinput);
      }
      return 1;
  }
  &register_handler("pushfile", \&push_file_handler, 1, 0, 1);
+ # The du_handler routine should be considered obsolete and is retained
+ # for communication with legacy servers.  Please see the du2_handler.
  #
- #   du  - list the disk usuage of a directory recursively.
+ #   du  - list the disk usage of a directory recursively.
  #
  #   note: stolen code from the ls file handler
  #   under construction by Rick Banghart
- Line 1268  sub du_handler {
+ Line 1344  sub du_handler {
  	chdir($ududir);
  	find($code,$ududir);
  	$total_size=int($total_size/1024);
- 	&Reply($client,"$total_size\n","$cmd:$ududir");
+ 	&Reply($client,\$total_size,"$cmd:$ududir");
      } else {
  	&Failure($client, "bad_directory:$ududir\n","$cmd:$ududir");
      }
- Line 1276  sub du_handler {
+ Line 1352  sub du_handler {
  }
  &register_handler("du", \&du_handler, 0, 1, 0);
+ # Please also see the du_handler, which is obsoleted by du2.
+ # du2_handler differs from du_handler in that required path to directory
+ # provided by &propath() is prepended in the handler instead of on the
+ # client side.
+ #
+ #   du2  - list the disk usage of a directory recursively.
  #
- # The ls_handler routine should be considered obosolete and is retained
+ # Parameters:
- # for communication with legacy servers.  Please see the ls2_handler.
+ #    $cmd        - The command that dispatched us (du).
+ #    $tail       - The tail of the request that invoked us.
+ #                  $tail is a : separated list of the following:
+ #                   - $ududir - directory path to list (before prepending)
+ #                   - $getpropath = 1 if &propath() should prepend
+ #                   - $uname - username to use for &propath or user dir
+ #                   - $udom - domain to use for &propath or user dir
+ #                   All are escaped.
+ #    $client     - Socket open on the client.
+ # Returns:
+ #     1 - indicating that the daemon should not disconnect.
+ # Side Effects:
+ #   The reply is written to $client.
+ #
+ sub du2_handler {
+     my ($cmd, $tail, $client) = @_;
+     my ($ududir,$getpropath,$uname,$udom) = map { &unescape($_) } (split(/:/, $tail));
+     my $userinput = "$cmd:$tail";
+     if (($ududir=~/\.\./) || (($ududir!~m|^/home/httpd/|) && (!$getpropath))) {
+         &Failure($client,"refused\n","$cmd:$tail");
+         return 1;
+     }
+     if ($getpropath) {
+         if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
+             $ududir = &propath($udom,$uname).'/'.$ududir;
+         } else {
+             &Failure($client,"refused\n","$cmd:$tail");
+             return 1;
+         }
+     }
+     #  Since $ududir could have some nasties in it,
+     #  we will require that ududir is a valid
+     #  directory.  Just in case someone tries to
+     #  slip us a  line like .;(cd /home/httpd rm -rf*)
+     #  etc.
+     #
+     if (-d $ududir) {
+         my $total_size=0;
+         my $code=sub {
+             if ($_=~/\.\d+\./) { return;}
+             if ($_=~/\.meta$/) { return;}
+             if (-d $_)         { return;}
+             $total_size+=(stat($_))[7];
+         };
+         chdir($ududir);
+         find($code,$ududir);
+         $total_size=int($total_size/1024);
+         &Reply($client,\$total_size,"$cmd:$ududir");
+     } else {
+         &Failure($client, "bad_directory:$ududir\n","$cmd:$tail");
+     }
+     return 1;
+ }
+ &register_handler("du2", \&du2_handler, 0, 1, 0);
+ #
+ # The ls_handler routine should be considered obsolete and is retained
+ # for communication with legacy servers.  Please see the ls3_handler.
  #
  #   ls  - list the contents of a directory.  For each file in the
  #    selected directory the filename followed by the full output of
  #    the stat function is returned.  The returned info for each
  #    file are separated by ':'.  The stat fields are separated by &'s.
+ #
+ #    If the requested path contains /../ or is:
+ #
+ #    1. for a directory, and the path does not begin with one of:
+ #        (a) /home/httpd/html/res/<domain>
+ #        (b) /home/httpd/html/userfiles/
+ #        (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
+ #    or is:
+ #
+ #    2. for a file, and the path (after prepending) does not begin with one of:
+ #        (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #        (b) /home/httpd/html/res/<domain>/<username>/
+ #        (c) /home/httpd/html/userfiles/<domain>/<username>/
+ #
+ #    the response will be "refused".
+ #
  # Parameters:
  #    $cmd        - The command that dispatched us (ls).
  #    $ulsdir     - The directory path to list... I'm not sure what this
- Line 1305  sub ls_handler {
+ Line 1461  sub ls_handler {
      my $rights;
      my $ulsout='';
      my $ulsfn;
+     if ($ulsdir =~m{/\.\./}) {
+         &Failure($client,"refused\n",$userinput);
+         return 1;
+     }
      if (-e $ulsdir) {
  	if(-d $ulsdir) {
+             unless (($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain|userfiles/)}) ||
+                     ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles})) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
  	    if (opendir(LSDIR,$ulsdir)) {
  		while ($ulsfn=readdir(LSDIR)) {
  		    undef($obs);
- Line 1330  sub ls_handler {
+ Line 1495  sub ls_handler {
  		closedir(LSDIR);
  	    }
  	} else {
+             unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) ||
+                     ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
  	    my @ulsstats=stat($ulsdir);
  	    $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
  	}
- Line 1337  sub ls_handler {
+ Line 1507  sub ls_handler {
  	$ulsout='no_such_dir';
      }
      if ($ulsout eq '') { $ulsout='empty'; }
-     &Reply($client, "$ulsout\n", $userinput); # This supports debug logging.
+     &Reply($client, \$ulsout, $userinput); # This supports debug logging.
      return 1;
  }
  &register_handler("ls", \&ls_handler, 0, 1, 0);
- #
+ # The ls2_handler routine should be considered obsolete and is retained
- # Please also see the ls_handler, which this routine obosolets.
+ # for communication with legacy servers.  Please see the ls3_handler.
+ # Please also see the ls_handler, which was itself obsoleted by ls2.
  # ls2_handler differs from ls_handler in that it escapes its return
  # values before concatenating them together with ':'s.
  #
- Line 1353  sub ls_handler {
+ Line 1524  sub ls_handler {
  #    selected directory the filename followed by the full output of
  #    the stat function is returned.  The returned info for each
  #    file are separated by ':'.  The stat fields are separated by &'s.
+ #
+ #    If the requested path contains /../ or is:
+ #
+ #    1. for a directory, and the path does not begin with one of:
+ #        (a) /home/httpd/html/res/<domain>
+ #        (b) /home/httpd/html/userfiles/
+ #        (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
+ #    or is:
+ #
+ #    2. for a file, and the path (after prepending) does not begin with one of:
+ #        (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #        (b) /home/httpd/html/res/<domain>/<username>/
+ #        (c) /home/httpd/html/userfiles/<domain>/<username>/
+ #
+ #    the response will be "refused".
+ #
  # Parameters:
  #    $cmd        - The command that dispatched us (ls).
  #    $ulsdir     - The directory path to list... I'm not sure what this
- Line 1373  sub ls2_handler {
+ Line 1560  sub ls2_handler {
      my $rights;
      my $ulsout='';
      my $ulsfn;
+     if ($ulsdir =~m{/\.\./}) {
+         &Failure($client,"refused\n",$userinput);
+         return 1;
+     }
      if (-e $ulsdir) {
          if(-d $ulsdir) {
+             unless (($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain|userfiles/)}) ||
+                     ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles})) {
+                 &Failure($client,"refused\n","$userinput");
+                 return 1;
+             }
              if (opendir(LSDIR,$ulsdir)) {
                  while ($ulsfn=readdir(LSDIR)) {
                      undef($obs);
- Line 1399  sub ls2_handler {
+ Line 1595  sub ls2_handler {
                  closedir(LSDIR);
              }
          } else {
+             unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) ||
+                     ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
              my @ulsstats=stat($ulsdir);
              $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
          }
- Line 1406  sub ls2_handler {
+ Line 1607  sub ls2_handler {
          $ulsout='no_such_dir';
     }
     if ($ulsout eq '') { $ulsout='empty'; }
-    &Reply($client, "$ulsout\n", $userinput); # This supports debug logging.
+    &Reply($client, \$ulsout, $userinput); # This supports debug logging.
     return 1;
  }
  &register_handler("ls2", \&ls2_handler, 0, 1, 0);
+ #
+ #   ls3  - list the contents of a directory.  For each file in the
+ #    selected directory the filename followed by the full output of
+ #    the stat function is returned.  The returned info for each
+ #    file are separated by ':'.  The stat fields are separated by &'s.
+ #
+ #    If the requested path (after prepending) contains /../ or is:
+ #
+ #    1. for a directory, and the path does not begin with one of:
+ #        (a) /home/httpd/html/res/<domain>
+ #        (b) /home/httpd/html/userfiles/
+ #        (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
+ #        (d) /home/httpd/html/priv/<domain> and client is the homeserver
+ #
+ #    or is:
+ #
+ #    2. for a file, and the path (after prepending) does not begin with one of:
+ #        (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
+ #        (b) /home/httpd/html/res/<domain>/<username>/
+ #        (c) /home/httpd/html/userfiles/<domain>/<username>/
+ #        (d) /home/httpd/html/priv/<domain>/<username>/ and client is the homeserver
+ #
+ #    the response will be "refused".
+ #
+ # Parameters:
+ #    $cmd        - The command that dispatched us (ls).
+ #    $tail       - The tail of the request that invoked us.
+ #                  $tail is a : separated list of the following:
+ #                   - $ulsdir - directory path to list (before prepending)
+ #                   - $getpropath = 1 if &propath() should prepend
+ #                   - $getuserdir = 1 if path to user dir in lonUsers should
+ #                                     prepend
+ #                   - $alternate_root - path to prepend
+ #                   - $uname - username to use for &propath or user dir
+ #                   - $udom - domain to use for &propath or user dir
+ #            All of these except $getpropath and &getuserdir are escaped.
+ #                  no_such_dir.
+ #    $client     - Socket open on the client.
+ # Returns:
+ #     1 - indicating that the daemon should not disconnect.
+ # Side Effects:
+ #   The reply is written to $client.
+ #
+ sub ls3_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($ulsdir,$getpropath,$getuserdir,$alternate_root,$uname,$udom) =
+         split(/:/,$tail);
+     if (defined($ulsdir)) {
+         $ulsdir = &unescape($ulsdir);
+     }
+     if (defined($alternate_root)) {
+         $alternate_root = &unescape($alternate_root);
+     }
+     if (defined($uname)) {
+         $uname = &unescape($uname);
+     }
+     if (defined($udom)) {
+         $udom = &unescape($udom);
+     }
+     my $dir_root = $perlvar{'lonDocRoot'};
+     if (($getpropath) || ($getuserdir)) {
+         if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
+             $dir_root = &propath($udom,$uname);
+             $dir_root =~ s/\/$//;
+         } else {
+             &Failure($client,"refused\n",$userinput);
+             return 1;
+         }
+     } elsif ($alternate_root ne '') {
+         $dir_root = $alternate_root;
+     }
+     if (($dir_root ne '') && ($dir_root ne '/')) {
+         if ($ulsdir =~ /^\//) {
+             $ulsdir = $dir_root.$ulsdir;
+         } else {
+             $ulsdir = $dir_root.'/'.$ulsdir;
+         }
+     }
+     if ($ulsdir =~m{/\.\./}) {
+         &Failure($client,"refused\n",$userinput);
+         return 1;
+     }
+     my $islocal;
+     my @machine_ids = &Apache::lonnet::current_machine_ids();
+     if (grep(/^\Q$clientname\E$/,@machine_ids)) {
+         $islocal = 1;
+     }
+     my $obs;
+     my $rights;
+     my $ulsout='';
+     my $ulsfn;
+     if (-e $ulsdir) {
+         if(-d $ulsdir) {
+             unless (($getpropath) || ($getuserdir) ||
+                     ($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain|userfiles/)}) ||
+                     ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles}) ||
+                     (($ulsdir =~ m{^/home/httpd/html/priv/$LONCAPA::match_domain}) && ($islocal))) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
+             if (opendir(LSDIR,$ulsdir)) {
+                 while ($ulsfn=readdir(LSDIR)) {
+                     undef($obs);
+                     undef($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|1)/) { $obs = 1; }
+                             if($obsolete =~ m|(<copyright>)(default)|) {
+                                 $rights = 1;
+                             }
+                         }
+                     }
+                     my $tmp = $ulsfn.'&'.join('&',@ulsstats);
+                     if ($obs    eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+                     if ($rights eq '1') { $tmp.="&1"; } else { $tmp.="&0"; }
+                     $ulsout.= &escape($tmp).':';
+                 }
+                 closedir(LSDIR);
+             }
+         } else {
+             unless (($getpropath) || ($getuserdir) ||
+                     ($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) ||
+                     ($ulsdir =~ m{^/home/httpd/html/(?:res|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/}) ||
+                     (($ulsdir =~ m{^/home/httpd/html/priv/$LONCAPA::match_domain/$LONCAPA::match_name/}) && ($islocal))) {
+                 &Failure($client,"refused\n",$userinput);
+                 return 1;
+             }
+             my @ulsstats=stat($ulsdir);
+             $ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
+         }
+     } else {
+         $ulsout='no_such_dir';
+     }
+     if ($ulsout eq '') { $ulsout='empty'; }
+     &Reply($client, \$ulsout, $userinput); # This supports debug logging.
+     return 1;
+ }
+ &register_handler("ls3", \&ls3_handler, 0, 1, 0);
+ sub read_lonnet_global {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $requested = &Apache::lonnet::thaw_unescape($tail);
+     my $result;
+     my %packagevars = (
+                         spareid => \%Apache::lonnet::spareid,
+                         perlvar => \%Apache::lonnet::perlvar,
+                       );
+     my %limit_to = (
+                     perlvar => {
+                                  lonOtherAuthen => 1,
+                                  lonBalancer    => 1,
+                                  lonVersion     => 1,
+                                  lonSysEMail    => 1,
+                                  lonHostID      => 1,
+                                  lonRole        => 1,
+                                  lonDefDomain   => 1,
+                                  lonLoadLim     => 1,
+                                  lonUserLoadLim => 1,
+                                }
+                   );
+     if (ref($requested) eq 'HASH') {
+         foreach my $what (keys(%{$requested})) {
+             my $response;
+             my $items = {};
+             if (exists($packagevars{$what})) {
+                 if (ref($limit_to{$what}) eq 'HASH') {
+                     foreach my $varname (keys(%{$packagevars{$what}})) {
+                         if ($limit_to{$what}{$varname}) {
+                             $items->{$varname} = $packagevars{$what}{$varname};
+                         }
+                     }
+                 } else {
+                     $items = $packagevars{$what};
+                 }
+                 if ($what eq 'perlvar') {
+                     if (!exists($packagevars{$what}{'lonBalancer'})) {
+                         if ($dist =~ /^(centos|rhes|fedora|scientific|oracle)/) {
+                             my $othervarref=LONCAPA::Configuration::read_conf('httpd.conf');
+                             if (ref($othervarref) eq 'HASH') {
+                                 $items->{'lonBalancer'} = $othervarref->{'lonBalancer'};
+                             }
+                         }
+                     }
+                 }
+                 $response = &Apache::lonnet::freeze_escape($items);
+             }
+             $result .= &escape($what).'='.$response.'&';
+         }
+     }
+     $result =~ s/\&$//;
+     &Reply($client,\$result,$userinput);
+     return 1;
+ }
+ &register_handler("readlonnetglobal", \&read_lonnet_global, 0, 1, 0);
+ sub server_devalidatecache_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $items = &unescape($tail);
+     my @cached = split(/\&/,$items);
+     foreach my $key (@cached) {
+         if ($key =~ /:/) {
+             my ($name,$id) = map { &unescape($_); } split(/:/,$key);
+             &Apache::lonnet::devalidate_cache_new($name,$id);
+         }
+     }
+     my $result = 'ok';
+     &Reply($client,\$result,$userinput);
+     return 1;
+ }
+ &register_handler("devalidatecache", \&server_devalidatecache_handler, 0, 1, 0);
+ sub server_timezone_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $timezone;
+     my $clockfile = '/etc/sysconfig/clock'; # Fedora/CentOS/SuSE
+     my $tzfile = '/etc/timezone'; # Debian/Ubuntu
+     if (-e $clockfile) {
+         if (open(my $fh,"<$clockfile")) {
+             while (<$fh>) {
+                 next if (/^[\#\s]/);
+                 if (/^(?:TIME)?ZONE\s*=\s*['"]?\s*([\w\/]+)/) {
+                     $timezone = $1;
+                     last;
+                 }
+             }
+             close($fh);
+         }
+     } elsif (-e $tzfile) {
+         if (open(my $fh,"<$tzfile")) {
+             $timezone = <$fh>;
+             close($fh);
+             chomp($timezone);
+             if ($timezone =~ m{^Etc/(\w+)$}) {
+                 $timezone = $1;
+             }
+         }
+     }
+     &Reply($client,\$timezone,$userinput); # This supports debug logging.
+     return 1;
+ }
+ &register_handler("servertimezone", \&server_timezone_handler, 0, 1, 0);
+ sub server_loncaparev_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     &Reply($client,\$perlvar{'lonVersion'},$userinput);
+     return 1;
+ }
+ &register_handler("serverloncaparev", \&server_loncaparev_handler, 0, 1, 0);
+ sub server_homeID_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     &Reply($client,\$perlvar{'lonHostID'},$userinput);
+     return 1;
+ }
+ &register_handler("serverhomeID", \&server_homeID_handler, 0, 1, 0);
+ sub server_distarch_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $reply = &distro_and_arch();
+     &Reply($client,\$reply,$userinput);
+     return 1;
+ }
+ &register_handler("serverdistarch", \&server_distarch_handler, 0, 1, 0);
  #   Process a reinit request.  Reinit requests that either
  #   lonc or lond be reinitialized so that an updated
- Line 1434  sub reinit_process_handler {
+ Line 1911  sub reinit_process_handler {
      if(&ValidManager($cert)) {
  	chomp($userinput);
  	my $reply = &ReinitProcess($userinput);
- 	&Reply( $client,  "$reply\n", $userinput);
+ 	&Reply( $client,  \$reply, $userinput);
      } else {
  	&Failure( $client, "refused\n", $userinput);
      }
- Line 1518  sub authenticate_handler {
+ Line 1995  sub authenticate_handler {
      #  udom    - User's domain.
      #  uname   - Username.
      #  upass   - User's password.
+     #  checkdefauth - Pass to validate_user() to try authentication
+     #                 with default auth type(s) if no user account.
+     #  clientcancheckhost - Passed by clients with functionality in lonauth.pm
+     #                       to check if session can be hosted.
-     my ($udom,$uname,$upass)=split(/:/,$tail);
+     my ($udom, $uname, $upass, $checkdefauth, $clientcancheckhost)=split(/:/,$tail);
-     &Debug(" Authenticate domain = $udom, user = $uname, password = $upass");
+     &Debug(" Authenticate domain = $udom, user = $uname, password = $upass,  checkdefauth = $checkdefauth");
      chomp($upass);
      $upass=&unescape($upass);
-     my $pwdcorrect = &validate_user($udom, $uname, $upass);
+     my $pwdcorrect = &validate_user($udom,$uname,$upass,$checkdefauth);
      if($pwdcorrect) {
- 	&Reply( $client, "authorized\n", $userinput);
+         my $canhost = 1;
+         unless ($clientcancheckhost) {
+             my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
+             my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
+             my @intdoms;
+             my $internet_names = &Apache::lonnet::get_internet_names($clientname);
+             if (ref($internet_names) eq 'ARRAY') {
+                 @intdoms = @{$internet_names};
+             }
+             unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
+                 my ($remote,$hosted);
+                 my $remotesession = &get_usersession_config($udom,'remotesession');
+                 if (ref($remotesession) eq 'HASH') {
+                     $remote = $remotesession->{'remote'};
+                 }
+                 my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');
+                 if (ref($hostedsession) eq 'HASH') {
+                     $hosted = $hostedsession->{'hosted'};
+                 }
+                 my $loncaparev = $clientversion;
+                 if ($loncaparev eq '') {
+                     $loncaparev = $Apache::lonnet::loncaparevs{$clientname};
+                 }
+                 $canhost = &Apache::lonnet::can_host_session($udom,$clientname,
+                                                              $loncaparev,
+                                                              $remote,$hosted);
+             }
+         }
+         if ($canhost) {
+             &Reply( $client, "authorized\n", $userinput);
+         } else {
+             &Reply( $client, "not_allowed_to_host\n", $userinput);
+         }
  	#
  	#  Bad credentials: Failed to authorize
  	#
- Line 1571  sub change_password_handler {
+ Line 2084  sub change_password_handler {
      #  npass - New password.
      #  context - Context in which this was called
      #            (preferences or reset_by_email).
+     #  lonhost - HostID of server where request originated
-     my ($udom,$uname,$upass,$npass,$context)=split(/:/,$tail);
+     my ($udom,$uname,$upass,$npass,$context,$lonhost)=split(/:/,$tail);
      $upass=&unescape($upass);
      $npass=&unescape($npass);
- Line 1581  sub change_password_handler {
+ Line 2095  sub change_password_handler {
      # First require that the user can be authenticated with their
      # old password unless context was 'reset_by_email':
-     my $validated;
+     my ($validated,$failure);
      if ($context eq 'reset_by_email') {
-         $validated = 1;
+         if ($lonhost eq '') {
+             $failure = 'invalid_client';
+         } else {
+             $validated = 1;
+         }
      } else {
          $validated = &validate_user($udom, $uname, $upass);
      }
      if($validated) {
  	my $realpasswd  = &get_auth_type($udom, $uname); # Defined since authd.
  	my ($howpwd,$contentpwd)=split(/:/,$realpasswd);
+         my $notunique;
  	if ($howpwd eq 'internal') {
  	    &Debug("internal auth");
- 	    my $salt=time;
+             my $ncpass = &hash_passwd($udom,$npass);
- 	    $salt=substr($salt,6,2);
+             my (undef,$method,@rest) = split(/!/,$contentpwd);
- 	    my $ncpass=crypt($npass,$salt);
+             if ($method eq 'bcrypt') {
- 	    if(&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
+                 my %passwdconf = &Apache::lonnet::get_passwdconf($udom);
- 		&logthis("Result of password change for "
+                 if (($passwdconf{'numsaved'}) && ($passwdconf{'numsaved'} =~ /^\d+$/)) {
- 			 ."$uname: pwchange_success");
+                     my @oldpasswds;
+                     my $userpath = &propath($udom,$uname);
+                     my $fullpath = $userpath.'/oldpasswds';
+                     if (-d $userpath) {
+                         my @oldfiles;
+                         if (-e $fullpath) {
+                             if (opendir(my $dir,$fullpath)) {
+                                 (@oldfiles) = grep(/^\d+$/,readdir($dir));
+                                 closedir($dir);
+                             }
+                             if (@oldfiles) {
+                                 @oldfiles = sort { $b <=> $a } (@oldfiles);
+                                 my $numremoved = 0;
+                                 for (my $i=0; $i<@oldfiles; $i++) {
+                                     if ($i>=$passwdconf{'numsaved'}) {
+                                         if (-f "$fullpath/$oldfiles[$i]") {
+                                             if (unlink("$fullpath/$oldfiles[$i]")) {
+                                                 $numremoved ++;
+                                             }
+                                         }
+                                     } elsif (open(my $fh,'<',"$fullpath/$oldfiles[$i]")) {
+                                         while (my $line = <$fh>) {
+                                             push(@oldpasswds,$line);
+                                         }
+                                         close($fh);
+                                     }
+                                 }
+                                 if ($numremoved) {
+                                     &logthis("unlinked $numremoved old password files for $uname:$udom");
+                                 }
+                             }
+                         }
+                         push(@oldpasswds,$contentpwd);
+                         foreach my $item (@oldpasswds) {
+                             my (undef,$method,@rest) = split(/!/,$item);
+                             if ($method eq 'bcrypt') {
+                                 my $result = &hash_passwd($udom,$npass,@rest);
+                                 if ($result eq $item) {
+                                     $notunique = 1;
+                                     last;
+                                 }
+                             }
+                         }
+                         unless ($notunique) {
+                             unless (-e $fullpath) {
+                                 if (&mkpath("$fullpath/")) {
+                                     chmod(0700,$fullpath);
+                                 }
+                             }
+                             if (-d $fullpath) {
+                                 my $now = time;
+                                 if (open(my $fh,'>',"$fullpath/$now")) {
+                                     print $fh $contentpwd;
+                                     close($fh);
+                                     chmod(0400,"$fullpath/$now");
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+             if ($notunique) {
+                 my $msg="Result of password change for $uname:$udom - password matches one used before";
+                 if ($lonhost) {
+                     $msg .= " - request originated from: $lonhost";
+                 }
+                 &logthis($msg);
+                 &Reply($client, "prioruse\n", $userinput);
+ 	    } elsif (&rewrite_password_file($udom, $uname, "internal:$ncpass")) {
+ 		my $msg="Result of password change for $uname: pwchange_success";
+                 if ($lonhost) {
+                     $msg .= " - request originated from: $lonhost";
+                 }
+                 &logthis($msg);
+                 &update_passwd_history($uname,$udom,$howpwd,$context);
  		&Reply($client, "ok\n", $userinput);
  	    } else {
  		&logthis("Unable to open $uname passwd "
- Line 1607  sub change_password_handler {
+ Line 2199  sub change_password_handler {
  	    }
  	} elsif ($howpwd eq 'unix' && $context ne 'reset_by_email') {
  	    my $result = &change_unix_password($uname, $npass);
+             if ($result eq 'ok') {
+                 &update_passwd_history($uname,$udom,$howpwd,$context);
+             }
  	    &logthis("Result of password change for $uname: ".
  		     $result);
- 	    &Reply($client, "$result\n", $userinput);
+ 	    &Reply($client, \$result, $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
- Line 1617  sub change_password_handler {
+ Line 2212  sub change_password_handler {
  	    #
  	    &Failure( $client, "auth_mode_error\n", $userinput);
  	}
      } else {
- 	&Failure( $client, "non_authorized\n", $userinput);
+ 	if ($failure eq '') {
+ 	    $failure = 'non_authorized';
+ 	}
+ 	&Failure( $client, "$failure\n", $userinput);
      }
      return 1;
  }
  &register_handler("passwd", \&change_password_handler, 1, 1, 0);
+ sub hash_passwd {
+     my ($domain,$plainpass,@rest) = @_;
+     my ($salt,$cost);
+     if (@rest) {
+         $cost = $rest[0];
+         # salt is first 22 characters, base-64 encoded by bcrypt
+         my $plainsalt = substr($rest[1],0,22);
+         $salt = Crypt::Eksblowfish::Bcrypt::de_base64($plainsalt);
+     } else {
+         my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+         my $defaultcost = $domdefaults{'intauth_cost'};
+         if (($defaultcost eq '') || ($defaultcost =~ /D/)) {
+             $cost = 10;
+         } else {
+             $cost = $defaultcost;
+         }
+         # Generate random 16-octet base64 salt
+         $salt = "";
+         $salt .= pack("C", int rand(256)) for 1..16;
+     }
+     my $hash = &Crypt::Eksblowfish::Bcrypt::bcrypt_hash({
+         key_nul => 1,
+         cost    => $cost,
+         salt    => $salt,
+     }, Digest::SHA::sha512(Encode::encode('UTF-8',$plainpass)));
+     my $result = join("!", "", "bcrypt", sprintf("%02d",$cost),
+                 &Crypt::Eksblowfish::Bcrypt::en_base64($salt).
+                 &Crypt::Eksblowfish::Bcrypt::en_base64($hash));
+     return $result;
+ }
  #
  #   Create a new user.  User in this case means a lon-capa user.
  #   The user must either already exist in some authentication realm
- Line 1669  sub add_user_handler {
+ Line 2298  sub add_user_handler {
  		    ."makeuser";
  	    }
  	    unless ($fperror) {
- 		my $result=&make_passwd_file($uname, $umode,$npass, $passfilename);
+ 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,
- 		&Reply($client, $result, $userinput);     #BUGBUG - could be fail
+                                              $passfilename,'makeuser');
+ 		&Reply($client,\$result, $userinput);     #BUGBUG - could be fail
  	    } else {
- 		&Failure($client, "$fperror\n", $userinput);
+ 		&Failure($client, \$fperror, $userinput);
  	    }
  	}
  	umask($oldumask);
- Line 1730  sub change_authentication_handler {
+ Line 2360  sub change_authentication_handler {
  	my $passfilename = &password_path($udom, $uname);
  	if ($passfilename) {	# Not allowed to create a new user!!
  	    # If just changing the unix passwd. need to arrange to run
- 	    # passwd since otherwise make_passwd_file will run
+ 	    # passwd since otherwise make_passwd_file will fail as
- 	    # lcuseradd which fails if an account already exists
+ 	    # creation of unix authenticated users is no longer supported
- 	    # (to prevent an unscrupulous LONCAPA admin from stealing
+             # except from the command line, when running make_domain_coordinator.pl
- 	    # an existing account by overwriting it as a LonCAPA account).
  	    if(($oldauth =~/^unix/) && ($umode eq "unix")) {
  		my $result = &change_unix_password($uname, $npass);
  		&logthis("Result of password change for $uname: ".$result);
  		if ($result eq "ok") {
- 		    &Reply($client, "$result\n")
+                     &update_passwd_history($uname,$udom,$umode,'changeuserauth');
+ 		    &Reply($client, \$result);
  		} else {
- 		    &Failure($client, "$result\n");
+ 		    &Failure($client, \$result);
  		}
  	    } else {
- 		my $result=&make_passwd_file($uname, $umode,$npass,$passfilename);
+ 		my $result=&make_passwd_file($uname,$udom,$umode,$npass,
+                                              $passfilename,'changeuserauth');
  		#
  		#  If the current auth mode is internal, and the old auth mode was
  		#  unix, or krb*,  and the user is an author for this domain,
  		#  re-run manage_permissions for that role in order to be able
  		#  to take ownership of the construction space back to www:www
  		#
- 		if( (($oldauth =~ /^unix/) && ($umode eq "internal")) ||
+ 		&Reply($client, \$result, $userinput);
- 		    (($oldauth =~ /^internal/) && ($umode eq "unix")) ) {
- 		    if(&is_author($udom, $uname)) {
- 			&Debug(" Need to manage author permissions...");
- 			&manage_permissions("/$udom/_au", $udom, $uname, "$umode:");
- 		    }
- 		}
- 		&Reply($client, $result, $userinput);
  	    }
- Line 1772  sub change_authentication_handler {
+ Line 2396  sub change_authentication_handler {
  }
  &register_handler("changeuserauth", \&change_authentication_handler, 1,1, 0);
+ sub update_passwd_history {
+     my ($uname,$udom,$umode,$context) = @_;
+     my $proname=&propath($udom,$uname);
+     my $now = time;
+     if (open(my $fh,">>$proname/passwd.log")) {
+         print $fh "$now:$umode:$context\n";
+         close($fh);
+     }
+     return;
+ }
  #
  #   Determines if this is the home server for a user.  The home server
  #   for a user will have his/her lon-capa passwd file.  Therefore all we need
- Line 1806  sub is_home_handler {
+ Line 2441  sub is_home_handler {
  &register_handler("home", \&is_home_handler, 0,1,0);
  #
- #   Process an update request for a resource?? I think what's going on here is
+ #   Process an update request for a resource.
- #   that a resource has been modified that we hold a subscription to.
+ #   A resource has been modified that we hold a subscription to.
  #   If the resource is not local, then we must update, or at least invalidate our
  #   cached copy of the resource.
- #   FUTURE WORK:
- #      I need to look at this logic carefully.  My druthers would be to follow
- #      typical caching logic, and simple invalidate the cache, drop any subscription
- #      an let the next fetch start the ball rolling again... however that may
- #      actually be more difficult than it looks given the complex web of
- #      proxy servers.
  # Parameters:
  #    $cmd      - The command that got us here.
  #    $tail     - Tail of the command (remaining parameters).
- Line 1839  sub update_resource_handler {
+ Line 2468  sub update_resource_handler {
      my $ownership=ishome($fname);
      if ($ownership eq 'not_owner') {
  	if (-e $fname) {
+             # Delete preview file, if exists
+             unlink("$fname.tmp");
+             # Get usage stats
  	    my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
  		$atime,$mtime,$ctime,$blksize,$blocks)=stat($fname);
  	    my $now=time;
  	    my $since=$now-$atime;
+             # If the file has not been used within lonExpire seconds,
+             # unsubscribe from it and delete local copy
  	    if ($since>$perlvar{'lonExpire'}) {
  		my $reply=&Apache::lonnet::reply("unsub:$fname","$clientname");
  		&devalidate_meta_cache($fname);
  		unlink("$fname");
  		unlink("$fname.meta");
  	    } else {
+             # Yes, this is in active use. Get a fresh copy. Since it might be in
+             # very active use and huge (like a movie), copy it to "in.transfer" filename first.
  		my $transname="$fname.in.transfer";
  		my $remoteurl=&Apache::lonnet::reply("sub:$fname","$clientname");
  		my $response;
- 		alarm(120);
+ # FIXME: cannot replicate files that take more than two minutes to transfer?
+ #		alarm(120);
+ # FIXME: this should use the LWP mechanism, not internal alarms.
+                 alarm(1200);
  		{
  		    my $ua=new LWP::UserAgent;
  		    my $request=new HTTP::Request('GET',"$remoteurl");
- Line 1860  sub update_resource_handler {
+ Line 2499  sub update_resource_handler {
  		}
  		alarm(0);
  		if ($response->is_error()) {
- 		    unlink($transname);
+                     my $reply=&Apache::lonnet::reply("unsub:$fname","$clientname");
+                     &devalidate_meta_cache($fname);
+                     if (-e $transname) {
+                         unlink($transname);
+                     }
+                     unlink($fname);
  		    my $message=$response->status_line;
  		    &logthis("LWP GET: $message for $fname ($remoteurl)");
  		} else {
  		    if ($remoteurl!~/\.meta$/) {
+ # FIXME: isn't there an internal LWP mechanism for this?
  			alarm(120);
  			{
  			    my $ua=new LWP::UserAgent;
- Line 1876  sub update_resource_handler {
+ Line 2521  sub update_resource_handler {
  			}
  			alarm(0);
  		    }
+                     # we successfully transfered, copy file over to real name
  		    rename($transname,$fname);
  		    &devalidate_meta_cache($fname);
  		}
- Line 1937  sub fetch_user_file_handler {
+ Line 2583  sub fetch_user_file_handler {
  	my $destname=$udir.'/'.$ufile;
  	my $transname=$udir.'/'.$ufile.'.in.transit';
- 	my $remoteurl='http://'.$clientip.'/userfiles/'.$fname;
+         my $clientprotocol=$Apache::lonnet::protocol{$clientname};
+         $clientprotocol = 'http' if ($clientprotocol ne 'https');
+ 	my $clienthost = &Apache::lonnet::hostname($clientname);
+ 	my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;
  	my $response;
  	Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");
  	alarm(120);
- Line 1959  sub fetch_user_file_handler {
+ Line 2608  sub fetch_user_file_handler {
  		unlink($transname);
  		&Failure($client, "failed\n", $userinput);
  	    } else {
+                 if ($fname =~ /^default.+\.(page|sequence)$/) {
+                     my ($major,$minor) = split(/\./,$clientversion);
+                     if (($major < 2) || ($major == 2 && $minor < 11)) {
+                         my $now = time;
+                         &Apache::lonnet::do_cache_new('crschange',$udom.'_'.$uname,$now,600);
+                         my $key = &escape('internal.contentchange');
+                         my $what = "$key=$now";
+                         my $hashref = &tie_user_hash($udom,$uname,'environment',
+                                                      &GDBM_WRCREAT(),"P",$what);
+                         if ($hashref) {
+                             $hashref->{$key}=$now;
+                             if (!&untie_user_hash($hashref)) {
+                                 &logthis("error: ".($!+0)." untie (GDBM) failed ".
+                                          "when updating internal.contentchange");
+                             }
+                         }
+                     }
+                 }
  		&Reply($client, "ok\n", $userinput);
  	    }
  	}
- Line 1995  sub remove_user_file_handler {
+ Line 2662  sub remove_user_file_handler {
  	    if (-e $file) {
  		#
  		#   If the file is a regular file unlink is fine...
- 		#   However it's possible the client wants a dir.
+ 		#   However it's possible the client wants a dir
- 		#   removed, in which case rmdir is more approprate:
+ 		#   removed, in which case rmdir is more appropriate
+ 	        #   Note: rmdir will only remove an empty directory.
  		#
  	        if (-f $file){
  		    unlink($file);
+                     # for html files remove the associated .bak file
+                     # which may have been created by the editor.
+                     if ($ufile =~ m{^((docs|supplemental)/(?:\d+|default)/\d+(?:|/.+)/)[^/]+\.x?html?$}i) {
+                         my $path = $1;
+                         if (-e $file.'.bak') {
+                             unlink($file.'.bak');
+                         }
+                     }
  		} elsif(-d $file) {
  		    rmdir($file);
  		}
- Line 2099  sub rename_user_file_handler {
+ Line 2775  sub rename_user_file_handler {
  &register_handler("renameuserfile", \&rename_user_file_handler, 0,1,0);
  #
+ #  Checks if the specified user has an active session on the server
+ #  return ok if so, not_found if not
+ #
+ # Parameters:
+ #   cmd      - The request keyword that dispatched to tus.
+ #   tail     - The tail of the request (colon separated parameters).
+ #   client   - Filehandle open on the client.
+ # Return:
+ #    1.
+ sub user_has_session_handler {
+     my ($cmd, $tail, $client) = @_;
+     my ($udom, $uname) = map { &unescape($_) } (split(/:/, $tail));
+     opendir(DIR,$perlvar{'lonIDsDir'});
+     my $filename;
+     while ($filename=readdir(DIR)) {
+ 	last if ($filename=~/^\Q$uname\E_\d+_\Q$udom\E_/);
+     }
+     if ($filename) {
+ 	&Reply($client, "ok\n", "$cmd:$tail");
+     } else {
+ 	&Failure($client, "not_found\n", "$cmd:$tail");
+     }
+     return 1;
+ }
+ &register_handler("userhassession", \&user_has_session_handler, 0,1,0);
+ #
  #  Authenticate access to a user file by checking that the token the user's
  #  passed also exists in their session file
  #
- Line 2114  sub token_auth_user_file_handler {
+ Line 2820  sub token_auth_user_file_handler {
      my ($fname, $session) = split(/:/, $tail);
      chomp($session);
-     my $reply="non_auth\n";
+     my $reply="non_auth";
      my $file = $perlvar{'lonIDsDir'}.'/'.$session.'.id';
      if (open(ENVIN,"$file")) {
  	flock(ENVIN,LOCK_SH);
  	tie(my %disk_env,'GDBM_File',"$file",&GDBM_READER(),0640);
  	if (exists($disk_env{"userfile.$fname"})) {
- 	    $reply="ok\n";
+ 	    $reply="ok";
  	} else {
  	    foreach my $envname (keys(%disk_env)) {
  		if ($envname=~ m|^userfile\.\Q$fname\E|) {
- 		    $reply="ok\n";
+ 		    $reply="ok";
  		    last;
  		}
  	    }
  	}
  	untie(%disk_env);
  	close(ENVIN);
- 	&Reply($client, $reply, "$cmd:$tail");
+ 	&Reply($client, \$reply, "$cmd:$tail");
      } else {
  	&Failure($client, "invalid_token\n", "$cmd:$tail");
      }
- Line 2191  sub subscribe_handler {
+ Line 2897  sub subscribe_handler {
  &register_handler("sub", \&subscribe_handler, 0, 1, 0);
  #
- #   Determine the version of a resource (?) Or is it return
+ #   Determine the latest version of a resource (it looks for the highest
- #   the top version of the resource?  Not yet clear from the
+ #   past version and then returns that +1)
- #   code in currentversion.
  #
  # Parameters:
  #    $cmd      - The command that got us here.
  #    $tail     - Tail of the command (remaining parameters).
+ #                 (Should consist of an absolute path to a file)
  #    $client   - File descriptor connected to client.
  # Returns
  #     0        - Requested to exit, caller should shut down.
- Line 2332  sub newput_user_profile_entry {
+ Line 3038  sub newput_user_profile_entry {
      foreach my $pair (@pairs) {
  	my ($key,$value)=split(/=/,$pair);
  	if (exists($hashref->{$key})) {
+             if (!&untie_user_hash($hashref)) {
+                 &logthis("error: ".($!+0)." untie (GDBM) failed ".
+                          "while attempting newput - early out as key exists");
+             }
  	    &Failure($client, "key_exists: ".$key."\n",$userinput);
  	    return 1;
  	}
- Line 2555  sub get_profile_entry {
+ Line 3265  sub get_profile_entry {
      my ($udom,$uname,$namespace,$what) = split(/:/,$tail);
      chomp($what);
      my $replystring = read_profile($udom, $uname, $namespace, $what);
      my ($first) = split(/:/,$replystring);
      if($first ne "error") {
- 	&Reply($client, "$replystring\n", $userinput);
+ 	&Reply($client, \$replystring, $userinput);
      } else {
  	&Failure($client, $replystring." while attempting get\n", $userinput);
      }
- Line 2582  sub get_profile_entry {
+ Line 3293  sub get_profile_entry {
  #
  #  Parameters:
  #     $cmd               - Command keyword of request (eget).
- #     $tail              - Tail of the command.  See GetProfileEntry
#                          for more information about this.
+ #     $tail              - Tail of the command.  See GetProfileEntry
+ #                          for more information about this.
  #     $client            - File open on the client.
  #  Returns:
  #     1      - Continue processing
- Line 2698  sub get_profile_keys {
+ Line 3410  sub get_profile_keys {
  	}
  	if (&untie_user_hash($hashref)) {
  	    $qresult=~s/\&$//;
- 	    &Reply($client, "$qresult\n", $userinput);
+ 	    &Reply($client, \$qresult, $userinput);
  	} else {
  	    &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
  		    "while attempting keys\n", $userinput);
- Line 2768  sub dump_profile_database {
+ Line 3480  sub dump_profile_database {
  		}
  	    }
  	    chop($qresult);
- 	    &Reply($client , "$qresult\n", $userinput);
+ 	    &Reply($client , \$qresult, $userinput);
  	} else {
  	    &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
  		     "while attempting currentdump\n", $userinput);
- Line 2800  sub dump_profile_database {
+ Line 3512  sub dump_profile_database {
  #                                             that is matched against
  #                                             database keywords to do
  #                                             selective dumps.
+ #                               range       - optional range of entries
+ #                                             e.g., 10-20 would return the
+ #                                             10th to 19th items, etc.
  #   $client                   - Channel open on the client.
  # Returns:
  #    1    - Continue processing.
- Line 2809  sub dump_profile_database {
+ Line 3524  sub dump_profile_database {
  sub dump_with_regexp {
      my ($cmd, $tail, $client) = @_;
+     my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);
-     my $userinput = "$cmd:$tail";
+     if ($res =~ /^error:/) {
+         &Failure($client, \$res, "$cmd:$tail");
-     my ($udom,$uname,$namespace,$regexp,$range)=split(/:/,$tail);
-     if (defined($regexp)) {
- 	$regexp=&unescape($regexp);
-     } else {
- 	$regexp='.';
-     }
-     my ($start,$end);
-     if (defined($range)) {
- 	if ($range =~/^(\d+)\-(\d+)$/) {
- 	    ($start,$end) = ($1,$2);
- 	} elsif ($range =~/^(\d+)$/) {
- 	    ($start,$end) = (0,$1);
- 	} else {
- 	    undef($range);
- 	}
-     }
-     my $hashref = &tie_user_hash($udom, $uname, $namespace,
- 				 &GDBM_READER());
-     if ($hashref) {
-         my $qresult='';
- 	my $count=0;
- 	while (my ($key,$value) = each(%$hashref)) {
- 	    if ($regexp eq '.') {
- 		$count++;
- 		if (defined($range) && $count >= $end)   { last; }
- 		if (defined($range) && $count <  $start) { next; }
- 		$qresult.=$key.'='.$value.'&';
- 	    } else {
- 		my $unescapeKey = &unescape($key);
- 		if (eval('$unescapeKey=~/$regexp/')) {
- 		    $count++;
- 		    if (defined($range) && $count >= $end)   { last; }
- 		    if (defined($range) && $count <  $start) { next; }
- 		    $qresult.="$key=$value&";
- 		}
- 	    }
- 	}
- 	if (&untie_user_hash($hashref)) {
- 	    chop($qresult);
- 	    &Reply($client, "$qresult\n", $userinput);
- 	} else {
- 	    &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
- 		     "while attempting dump\n", $userinput);
- 	}
      } else {
- 	&Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+         &Reply($client, \$res, "$cmd:$tail");
- 		"while attempting dump\n", $userinput);
      }
      return 1;
- Line 2875  sub dump_with_regexp {
+ Line 3546  sub dump_with_regexp {
  #                          namespace   - Name of the database being modified
  #                          rid         - Resource keyword to modify.
  #                          what        - new value associated with rid.
+ #                          laststore   - (optional) version=timestamp
+ #                                        for most recent transaction for rid
+ #                                        in namespace, when cstore was called
  #
  #    $client             - Socket open on the client.
  #
- Line 2883  sub dump_with_regexp {
+ Line 3557  sub dump_with_regexp {
  #      1 (keep on processing).
  #  Side-Effects:
  #    Writes to the client
+ #    Successful storage will cause either 'ok', or, if $laststore was included
+ #    in the tail of the request, and the version number for the last transaction
+ #    is larger than the version in $laststore, delay:$numtrans , where $numtrans
+ #    is the number of store evevnts recorded for rid in namespace since
+ #    lonnet::store() was called by the client.
+ #
  sub store_handler {
      my ($cmd, $tail, $client) = @_;
      my $userinput = "$cmd:$tail";
-     my ($udom,$uname,$namespace,$rid,$what) =split(/:/,$tail);
+     chomp($tail);
+     my ($udom,$uname,$namespace,$rid,$what,$laststore) =split(/:/,$tail);
      if ($namespace ne 'roles') {
- 	chomp($what);
  	my @pairs=split(/\&/,$what);
  	my $hashref  = &tie_user_hash($udom, $uname, $namespace,
  				       &GDBM_WRCREAT(), "S",
  				       "$rid:$what");
  	if ($hashref) {
  	    my $now = time;
- 	    my @previouskeys=split(/&/,$hashref->{"keys:$rid"});
+             my $numtrans;
- 	    my $key;
+             if ($laststore) {
+                 my ($previousversion,$previoustime) = split(/\=/,$laststore);
+                 my ($lastversion,$lasttime) = (0,0);
+                 $lastversion = $hashref->{"version:$rid"};
+                 if ($lastversion) {
+                     $lasttime = $hashref->{"$lastversion:$rid:timestamp"};
+                 }
+                 if (($previousversion) && ($previousversion !~ /\D/)) {
+                     if (($lastversion > $previousversion) && ($lasttime >= $previoustime)) {
+                         $numtrans = $lastversion - $previousversion;
+                     }
+                 } elsif ($lastversion) {
+                     $numtrans = $lastversion;
+                 }
+                 if ($numtrans) {
+                     $numtrans =~ s/D//g;
+                 }
+             }
  	    $hashref->{"version:$rid"}++;
  	    my $version=$hashref->{"version:$rid"};
  	    my $allkeys='';
- Line 2912  sub store_handler {
+ Line 3610  sub store_handler {
  	    $allkeys.='timestamp';
  	    $hashref->{"$version:keys:$rid"}=$allkeys;
  	    if (&untie_user_hash($hashref)) {
- 		&Reply($client, "ok\n", $userinput);
+                 my $msg = 'ok';
+                 if ($numtrans) {
+                     $msg = 'delay:'.$numtrans;
+                 }
+                 &Reply($client, "$msg\n", $userinput);
  	    } else {
  		&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
  			"while attempting store\n", $userinput);
- Line 3059  sub restore_handler {
+ Line 3761  sub restore_handler {
  	}
  	if (&untie_user_hash($hashref)) {
  	    $qresult=~s/\&$//;
- 	    &Reply( $client, "$qresult\n", $userinput);
+ 	    &Reply( $client, \$qresult, $userinput);
  	} else {
  	    &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
  		    "while attempting restore\n", $userinput);
- Line 3140  sub retrieve_chat_handler {
+ Line 3842  sub retrieve_chat_handler {
  	$reply.=&escape($_).':';
      }
      $reply=~s/\:$//;
-     &Reply($client, $reply."\n", $userinput);
+     &Reply($client, \$reply, $userinput);
      return 1;
- Line 3174  sub send_query_handler {
+ Line 3876  sub send_query_handler {
      my ($query,$arg1,$arg2,$arg3)=split(/\:/,$tail);
      $query=~s/\n*$//g;
+     if (($query eq 'usersearch') || ($query eq 'instdirsearch')) {
+         my $usersearchconf = &get_usersearch_config($currentdomainid,'directorysrch');
+         my $earlyout;
+         if (ref($usersearchconf) eq 'HASH') {
+             if ($currentdomainid eq $clienthomedom) {
+                 if ($query eq 'usersearch') {
+                     if ($usersearchconf->{'lcavailable'} eq '0') {
+                         $earlyout = 1;
+                     }
+                 } else {
+                     if ($usersearchconf->{'available'} eq '0') {
+                         $earlyout = 1;
+                     }
+                 }
+             } else {
+                 if ($query eq 'usersearch') {
+                     if ($usersearchconf->{'lclocalonly'}) {
+                         $earlyout = 1;
+                     }
+                 } else {
+                     if ($usersearchconf->{'localonly'}) {
+                         $earlyout = 1;
+                     }
+                 }
+             }
+         }
+         if ($earlyout) {
+             &Reply($client, "query_not_authorized\n");
+             return 1;
+         }
+     }
      &Reply($client, "". &sql_reply("$clientname\&$query".
  				"\&$arg1"."\&$arg2"."\&$arg3")."\n",
  	  $userinput);
- Line 3277  sub put_course_id_handler {
+ Line 4010  sub put_course_id_handler {
  	foreach my $pair (@pairs) {
              my ($key,$courseinfo) = split(/=/,$pair,2);
              $courseinfo =~ s/=/:/g;
+             if (defined($hashref->{$key})) {
+                 my $value = &Apache::lonnet::thaw_unescape($hashref->{$key});
+                 if (ref($value) eq 'HASH') {
+                     my @items = ('description','inst_code','owner','type');
+                     my @new_items = split(/:/,$courseinfo,-1);
+                     my %storehash;
+                     for (my $i=0; $i<@new_items; $i++) {
+                         $storehash{$items[$i]} = &unescape($new_items[$i]);
+                     }
+                     $hashref->{$key} =
+                         &Apache::lonnet::freeze_escape(\%storehash);
+                     my $unesc_key = &unescape($key);
+                     $hashref->{&escape('lasttime:'.$unesc_key)} = $now;
+                     next;
+                 }
+             }
              my @current_items = split(/:/,$hashref->{$key},-1);
              shift(@current_items); # remove description
              pop(@current_items);   # remove last access
- Line 3293  sub put_course_id_handler {
+ Line 4042  sub put_course_id_handler {
                      }
                  }
              }
- 	    $hashref->{$key}=$courseinfo.':'.$now;
+             $hashref->{$key}=$courseinfo.':'.$now;
  	}
  	if (&untie_domain_hash($hashref)) {
  	    &Reply( $client, "ok\n", $userinput);
- Line 3307  sub put_course_id_handler {
+ Line 4056  sub put_course_id_handler {
  		 ." tie(GDBM) Failed ".
  		 "while attempting courseidput\n", $userinput);
      }
      return 1;
  }
  &register_handler("courseidput", \&put_course_id_handler, 0, 1, 0);
+ sub put_course_id_hash_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($udom,$mode,$what) = split(/:/, $tail,3);
+     chomp($what);
+     my $now=time;
+     my @pairs=split(/\&/,$what);
+     my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
+     if ($hashref) {
+         foreach my $pair (@pairs) {
+             my ($key,$value)=split(/=/,$pair);
+             my $unesc_key = &unescape($key);
+             if ($mode ne 'timeonly') {
+                 if (!defined($hashref->{&escape('lasttime:'.$unesc_key)})) {
+                     my $curritems = &Apache::lonnet::thaw_unescape($key);
+                     if (ref($curritems) ne 'HASH') {
+                         my @current_items = split(/:/,$hashref->{$key},-1);
+                         my $lasttime = pop(@current_items);
+                         $hashref->{&escape('lasttime:'.$unesc_key)} = $lasttime;
+                     } else {
+                         $hashref->{&escape('lasttime:'.$unesc_key)} = '';
+                     }
+                 }
+                 $hashref->{$key} = $value;
+             }
+             if ($mode ne 'notime') {
+                 $hashref->{&escape('lasttime:'.$unesc_key)} = $now;
+             }
+         }
+         if (&untie_domain_hash($hashref)) {
+             &Reply($client, "ok\n", $userinput);
+         } else {
+             &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+                      "while attempting courseidputhash\n", $userinput);
+         }
+     } else {
+         &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+                   "while attempting courseidputhash\n", $userinput);
+     }
+     return 1;
+ }
+ &register_handler("courseidputhash", \&put_course_id_hash_handler, 0, 1, 0);
  #  Retrieves the value of a course id resource keyword pattern
  #  defined since a starting date.  Both the starting date and the
  #  keyword pattern are optional.  If the starting date is not supplied it
- Line 3339  sub put_course_id_handler {
+ Line 4130  sub put_course_id_handler {
  #                            owner matches the supplied username and/or domain
  #                            will be returned. Pre-2.2.0 legacy entries from
  #                            nohist_courseiddump will only contain usernames.
+ #                 type     - optional parameter for selection
+ #                 regexp_ok - if 1 or -1 allow the supplied institutional code
+ #                            filter to behave as a regular expression:
+ #	                      1 will not exclude the course if the instcode matches the RE
+ #                            -1 will exclude the course if the instcode matches the RE
+ #                 rtn_as_hash - whether to return the information available for
+ #                            each matched item as a frozen hash of all
+ #                            key, value pairs in the item's hash, or as a
+ #                            colon-separated list of (in order) description,
+ #                            institutional code, and course owner.
+ #                 selfenrollonly - filter by courses allowing self-enrollment
+ #                                  now or in the future (selfenrollonly = 1).
+ #                 catfilter - filter by course category, assigned to a course
+ #                             using manually defined categories (i.e., not
+ #                             self-cataloging based on on institutional code).
+ #                 showhidden - include course in results even if course
+ #                              was set to be excluded from course catalog (DC only).
+ #                 caller -  if set to 'coursecatalog', courses set to be hidden
+ #                           from course catalog will be excluded from results (unless
+ #                           overridden by "showhidden".
+ #                 cloner - escaped username:domain of course cloner (if picking course to
+ #                          clone).
+ #                 cc_clone_list - escaped comma separated list of courses for which
+ #                                 course cloner has active CC role (and so can clone
+ #                                 automatically).
+ #                 cloneonly - filter by courses for which cloner has rights to clone.
+ #                 createdbefore - include courses for which creation date preceeded this date.
+ #                 createdafter - include courses for which creation date followed this date.
+ #                 creationcontext - include courses created in specified context
+ #
+ #                 domcloner - flag to indicate if user can create CCs in course's domain.
+ #                             If so, ability to clone course is automatic.
+ #                 hasuniquecode - filter by courses for which a six character unique code has
+ #                                 been set.
+ #
  #     $client  - The socket open on the client.
  # Returns:
  #    1     - Continue processing.
- Line 3346  sub put_course_id_handler {
+ Line 4172  sub put_course_id_handler {
  #   a reply is written to $client.
  sub dump_course_id_handler {
      my ($cmd, $tail, $client) = @_;
      my $userinput = "$cmd:$tail";
      my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
-         $typefilter,$regexp_ok) =split(/:/,$tail);
+         $typefilter,$regexp_ok,$rtn_as_hash,$selfenrollonly,$catfilter,$showhidden,
+         $caller,$cloner,$cc_clone_list,$cloneonly,$createdbefore,$createdafter,
+         $creationcontext,$domcloner,$hasuniquecode) =split(/:/,$tail);
+     my $now = time;
+     my ($cloneruname,$clonerudom,%cc_clone);
      if (defined($description)) {
  	$description=&unescape($description);
      } else {
- Line 3390  sub dump_course_id_handler {
+ Line 4219  sub dump_course_id_handler {
      if (defined($regexp_ok)) {
          $regexp_ok=&unescape($regexp_ok);
      }
+     if (defined($catfilter)) {
-     unless (defined($since)) { $since=0; }
+         $catfilter=&unescape($catfilter);
+     }
+     if (defined($cloner)) {
+         $cloner = &unescape($cloner);
+         ($cloneruname,$clonerudom) = ($cloner =~ /^($LONCAPA::match_username):($LONCAPA::match_domain)$/);
+     }
+     if (defined($cc_clone_list)) {
+         $cc_clone_list = &unescape($cc_clone_list);
+         my @cc_cloners = split('&',$cc_clone_list);
+         foreach my $cid (@cc_cloners) {
+             my ($clonedom,$clonenum) = split(':',$cid);
+             next if ($clonedom ne $udom);
+             $cc_clone{$clonedom.'_'.$clonenum} = 1;
+         }
+     }
+     if ($createdbefore ne '') {
+         $createdbefore = &unescape($createdbefore);
+     } else {
+        $createdbefore = 0;
+     }
+     if ($createdafter ne '') {
+         $createdafter = &unescape($createdafter);
+     } else {
+         $createdafter = 0;
+     }
+     if ($creationcontext ne '') {
+         $creationcontext = &unescape($creationcontext);
+     } else {
+         $creationcontext = '.';
+     }
+     unless ($hasuniquecode) {
+         $hasuniquecode = '.';
+     }
+     my $unpack = 1;
+     if ($description eq '.' && $instcodefilter eq '.' && $ownerfilter eq '.' &&
+         $typefilter eq '.') {
+         $unpack = 0;
+     }
+     if (!defined($since)) { $since=0; }
      my $qresult='';
      my $hashref = &tie_domain_hash($udom, "nohist_courseids", &GDBM_WRCREAT());
      if ($hashref) {
  	while (my ($key,$value) = each(%$hashref)) {
- 	    my ($descr,$lasttime,$inst_code,$owner,$type);
+             my ($unesc_key,$lasttime_key,$lasttime,$is_hash,%val,
-             my @courseitems = split(/:/,$value);
+                 %unesc_val,$selfenroll_end,$selfenroll_types,$created,
-             $lasttime = pop(@courseitems);
+                 $context);
- 	    ($descr,$inst_code,$owner,$type)=@courseitems;
+             $unesc_key = &unescape($key);
- 	    if ($lasttime<$since) { next; }
+             if ($unesc_key =~ /^lasttime:/) {
+                 next;
+             } else {
+                 $lasttime_key = &escape('lasttime:'.$unesc_key);
+             }
+             if ($hashref->{$lasttime_key} ne '') {
+                 $lasttime = $hashref->{$lasttime_key};
+                 next if ($lasttime<$since);
+             }
+             my ($canclone,$valchange);
+             my $items = &Apache::lonnet::thaw_unescape($value);
+             if (ref($items) eq 'HASH') {
+                 if ($hashref->{$lasttime_key} eq '') {
+                     next if ($since > 1);
+                 }
+                 $is_hash =  1;
+                 if ($domcloner) {
+                     $canclone = 1;
+                 } elsif (defined($clonerudom)) {
+                     if ($items->{'cloners'}) {
+                         my @cloneable = split(',',$items->{'cloners'});
+                         if (@cloneable) {
+                             if (grep(/^\*$/,@cloneable))  {
+                                 $canclone = 1;
+                             } elsif (grep(/^\*:\Q$clonerudom\E$/,@cloneable)) {
+                                 $canclone = 1;
+                             } elsif (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) {
+                                 $canclone = 1;
+                             }
+                         }
+                         unless ($canclone) {
+                             if ($cloneruname ne '' && $clonerudom ne '') {
+                                 if ($cc_clone{$unesc_key}) {
+                                     $canclone = 1;
+                                     $items->{'cloners'} .= ','.$cloneruname.':'.
+                                                            $clonerudom;
+                                     $valchange = 1;
+                                 }
+                             }
+                         }
+                     } elsif (defined($cloneruname)) {
+                         if ($cc_clone{$unesc_key}) {
+                             $canclone = 1;
+                             $items->{'cloners'} = $cloneruname.':'.$clonerudom;
+                             $valchange = 1;
+                         }
+                         unless ($canclone) {
+                             if ($items->{'owner'} =~ /:/) {
+                                 if ($items->{'owner'} eq $cloner) {
+                                     $canclone = 1;
+                                 }
+                             } elsif ($cloner eq $items->{'owner'}.':'.$udom) {
+                                 $canclone = 1;
+                             }
+                             if ($canclone) {
+                                 $items->{'cloners'} = $cloneruname.':'.$clonerudom;
+                                 $valchange = 1;
+                             }
+                         }
+                     }
+                 }
+                 if ($unpack || !$rtn_as_hash) {
+                     $unesc_val{'descr'} = $items->{'description'};
+                     $unesc_val{'inst_code'} = $items->{'inst_code'};
+                     $unesc_val{'owner'} = $items->{'owner'};
+                     $unesc_val{'type'} = $items->{'type'};
+                     $unesc_val{'cloners'} = $items->{'cloners'};
+                     $unesc_val{'created'} = $items->{'created'};
+                     $unesc_val{'context'} = $items->{'context'};
+                 }
+                 $selfenroll_types = $items->{'selfenroll_types'};
+                 $selfenroll_end = $items->{'selfenroll_end_date'};
+                 $created = $items->{'created'};
+                 $context = $items->{'context'};
+                 if ($hasuniquecode ne '.') {
+                     next unless ($items->{'uniquecode'});
+                 }
+                 if ($selfenrollonly) {
+                     next if (!$selfenroll_types);
+                     if (($selfenroll_end > 0) && ($selfenroll_end <= $now)) {
+                         next;
+                     }
+                 }
+                 if ($creationcontext ne '.') {
+                     next if (($context ne '') && ($context ne $creationcontext));
+                 }
+                 if ($createdbefore > 0) {
+                     next if (($created eq '') || ($created > $createdbefore));
+                 }
+                 if ($createdafter > 0) {
+                     next if (($created eq '') || ($created <= $createdafter));
+                 }
+                 if ($catfilter ne '') {
+                     next if ($items->{'categories'} eq '');
+                     my @categories = split('&',$items->{'categories'});
+                     next if (@categories == 0);
+                     my @subcats = split('&',$catfilter);
+                     my $matchcat = 0;
+                     foreach my $cat (@categories) {
+                         if (grep(/^\Q$cat\E$/,@subcats)) {
+                             $matchcat = 1;
+                             last;
+                         }
+                     }
+                     next if (!$matchcat);
+                 }
+                 if ($caller eq 'coursecatalog') {
+                     if ($items->{'hidefromcat'} eq 'yes') {
+                         next if !$showhidden;
+                     }
+                 }
+             } else {
+                 next if ($catfilter ne '');
+                 next if ($selfenrollonly);
+                 next if ($createdbefore || $createdafter);
+                 next if ($creationcontext ne '.');
+                 if ((defined($clonerudom)) && (defined($cloneruname)))  {
+                     if ($cc_clone{$unesc_key}) {
+                         $canclone = 1;
+                         $val{'cloners'} = &escape($cloneruname.':'.$clonerudom);
+                     }
+                 }
+                 $is_hash =  0;
+                 my @courseitems = split(/:/,$value);
+                 $lasttime = pop(@courseitems);
+                 if ($hashref->{$lasttime_key} eq '') {
+                     next if ($lasttime<$since);
+                 }
+ 	        ($val{'descr'},$val{'inst_code'},$val{'owner'},$val{'type'}) = @courseitems;
+             }
+             if ($cloneonly) {
+                next unless ($canclone);
+             }
              my $match = 1;
- 	    unless ($description eq '.') {
+ 	    if ($description ne '.') {
- 		my $unescapeDescr = &unescape($descr);
+                 if (!$is_hash) {
- 		unless (eval('$unescapeDescr=~/\Q$description\E/i')) {
+                     $unesc_val{'descr'} = &unescape($val{'descr'});
+                 }
+                 if (eval{$unesc_val{'descr'} !~ /\Q$description\E/i}) {
                      $match = 0;
- 		}
+                 }
              }
-             unless ($instcodefilter eq '.' || !defined($instcodefilter)) {
+             if ($instcodefilter ne '.') {
-                 my $unescapeInstcode = &unescape($inst_code);
+                 if (!$is_hash) {
-                 if ($regexp_ok) {
+                     $unesc_val{'inst_code'} = &unescape($val{'inst_code'});
-                     unless (eval('$unescapeInstcode=~/$instcodefilter/')) {
+                 }
+                 if ($regexp_ok == 1) {
+                     if (eval{$unesc_val{'inst_code'} !~ /$instcodefilter/}) {
+                         $match = 0;
+                     }
+                 } elsif ($regexp_ok == -1) {
+                     if (eval{$unesc_val{'inst_code'} =~ /$instcodefilter/}) {
                          $match = 0;
                      }
                  } else {
-                     unless (eval('$unescapeInstcode=~/\Q$instcodefilter\E/i')) {
+                     if (eval{$unesc_val{'inst_code'} !~ /\Q$instcodefilter\E/i}) {
                          $match = 0;
                      }
                  }
  	    }
-             unless ($ownerfilter eq '.' || !defined($ownerfilter)) {
+             if ($ownerfilter ne '.') {
-                 my $unescapeOwner = &unescape($owner);
+                 if (!$is_hash) {
+                     $unesc_val{'owner'} = &unescape($val{'owner'});
+                 }
                  if (($ownerunamefilter ne '') && ($ownerdomfilter ne '')) {
-                     if ($unescapeOwner =~ /:/) {
+                     if ($unesc_val{'owner'} =~ /:/) {
-                         if (eval('$unescapeOwner !~
+                         if (eval{$unesc_val{'owner'} !~
-                              /\Q$ownerunamefilter\E:\Q$ownerdomfilter\E$/i')) {
+                              /\Q$ownerunamefilter\E:\Q$ownerdomfilter\E$/i}) {
                              $match = 0;
                          }
                      } else {
-                         if (eval('$unescapeOwner!~/\Q$ownerunamefilter\E/i')) {
+                         if (eval{$unesc_val{'owner'} !~ /\Q$ownerunamefilter\E/i}) {
                              $match = 0;
                          }
                      }
                  } elsif ($ownerunamefilter ne '') {
-                     if ($unescapeOwner =~ /:/) {
+                     if ($unesc_val{'owner'} =~ /:/) {
-                         if (eval('$unescapeOwner!~/\Q$ownerunamefilter\E:[^:]+$/i')) {
+                         if (eval{$unesc_val{'owner'} !~ /\Q$ownerunamefilter\E:[^:]+$/i}) {
                               $match = 0;
                          }
                      } else {
-                         if (eval('$unescapeOwner!~/\Q$ownerunamefilter\E/i')) {
+                         if (eval{$unesc_val{'owner'} !~ /\Q$ownerunamefilter\E/i}) {
                              $match = 0;
                          }
                      }
                  } elsif ($ownerdomfilter ne '') {
-                     if ($unescapeOwner =~ /:/) {
+                     if ($unesc_val{'owner'} =~ /:/) {
-                         if (eval('$unescapeOwner!~/^[^:]+:\Q$ownerdomfilter\E/')) {
+                         if (eval{$unesc_val{'owner'} !~ /^[^:]+:\Q$ownerdomfilter\E/}) {
                               $match = 0;
                          }
                      } else {
- Line 3455  sub dump_course_id_handler {
+ Line 4464  sub dump_course_id_handler {
                      }
                  }
              }
-             unless ($coursefilter eq '.' || !defined($coursefilter)) {
+             if ($coursefilter ne '.') {
-                 my $unescapeCourse = &unescape($key);
+                 if (eval{$unesc_key !~ /^$udom(_)\Q$coursefilter\E$/}) {
-                 unless (eval('$unescapeCourse=~/^$udom(_)\Q$coursefilter\E$/')) {
                      $match = 0;
                  }
              }
-             unless ($typefilter eq '.' || !defined($typefilter)) {
+             if ($typefilter ne '.') {
-                 my $unescapeType = &unescape($type);
+                 if (!$is_hash) {
-                 if ($type eq '') {
+                     $unesc_val{'type'} = &unescape($val{'type'});
+                 }
+                 if ($unesc_val{'type'} eq '') {
                      if ($typefilter ne 'Course') {
                          $match = 0;
                      }
                  } else {
-                     unless (eval('$unescapeType=~/^\Q$typefilter\E$/')) {
+                     if (eval{$unesc_val{'type'} !~ /^\Q$typefilter\E$/}) {
                          $match = 0;
                      }
                  }
              }
              if ($match == 1) {
-                 $qresult.=$key.'='.$descr.':'.$inst_code.':'.$owner.'&';
+                 if ($rtn_as_hash) {
+                     if ($is_hash) {
+                         if ($valchange) {
+                             my $newvalue = &Apache::lonnet::freeze_escape($items);
+                             $qresult.=$key.'='.$newvalue.'&';
+                         } else {
+                             $qresult.=$key.'='.$value.'&';
+                         }
+                     } else {
+                         my %rtnhash = ( 'description' => &unescape($val{'descr'}),
+                                         'inst_code' => &unescape($val{'inst_code'}),
+                                         'owner'     => &unescape($val{'owner'}),
+                                         'type'      => &unescape($val{'type'}),
+                                         'cloners'   => &unescape($val{'cloners'}),
+                                       );
+                         my $items = &Apache::lonnet::freeze_escape(\%rtnhash);
+                         $qresult.=$key.'='.$items.'&';
+                     }
+                 } else {
+                     if ($is_hash) {
+                         $qresult .= $key.'='.&escape($unesc_val{'descr'}).':'.
+                                     &escape($unesc_val{'inst_code'}).':'.
+                                     &escape($unesc_val{'owner'}).'&';
+                     } else {
+                         $qresult .= $key.'='.$val{'descr'}.':'.$val{'inst_code'}.
+                                     ':'.$val{'owner'}.'&';
+                     }
+                 }
              }
  	}
  	if (&untie_domain_hash($hashref)) {
  	    chop($qresult);
- 	    &Reply($client, "$qresult\n", $userinput);
+ 	    &Reply($client, \$qresult, $userinput);
  	} else {
  	    &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
  		    "while attempting courseiddump\n", $userinput);
- Line 3488  sub dump_course_id_handler {
+ Line 4525  sub dump_course_id_handler {
  	&Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
  		"while attempting courseiddump\n", $userinput);
      }
      return 1;
  }
  &register_handler("courseiddump", \&dump_course_id_handler, 0, 1, 0);
+ sub course_lastaccess_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($cdom,$cnum) = split(':',$tail);
+     my (%lastaccess,$qresult);
+     my $hashref = &tie_domain_hash($cdom, "nohist_courseids", &GDBM_WRCREAT());
+     if ($hashref) {
+         while (my ($key,$value) = each(%$hashref)) {
+             my ($unesc_key,$lasttime);
+             $unesc_key = &unescape($key);
+             if ($cnum) {
+                 next unless ($unesc_key =~ /\Q$cdom\E_\Q$cnum\E$/);
+             }
+             if ($unesc_key =~ /^lasttime:($LONCAPA::match_domain\_$LONCAPA::match_courseid)/) {
+                 $lastaccess{$1} = $value;
+             } else {
+                 my $items = &Apache::lonnet::thaw_unescape($value);
+                 if (ref($items) eq 'HASH') {
+                     unless ($lastaccess{$unesc_key}) {
+                         $lastaccess{$unesc_key} = '';
+                     }
+                 } else {
+                     my @courseitems = split(':',$value);
+                     $lastaccess{$unesc_key} = pop(@courseitems);
+                 }
+             }
+         }
+         foreach my $cid (sort(keys(%lastaccess))) {
+             $qresult.=&escape($cid).'='.$lastaccess{$cid}.'&';
+         }
+         if (&untie_domain_hash($hashref)) {
+             if ($qresult) {
+                 chop($qresult);
+             }
+             &Reply($client, \$qresult, $userinput);
+         } else {
+             &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+                     "while attempting lastacourseaccess\n", $userinput);
+         }
+     } else {
+         &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
+                 "while attempting lastcourseaccess\n", $userinput);
+     }
+     return 1;
+ }
+ &register_handler("courselastaccess",\&course_lastaccess_handler, 0, 1, 0);
  #
  # Puts an unencrypted entry in a namespace db file at the domain level
  #
- Line 3559  sub put_domain_handler {
+ Line 4641  sub put_domain_handler {
  sub get_domain_handler {
      my ($cmd, $tail, $client) = @_;
-     my $userinput = "$client:$tail";
+     my $userinput = "$cmd:$tail";
      my ($udom,$namespace,$what)=split(/:/,$tail,3);
      chomp($what);
- Line 3572  sub get_domain_handler {
+ Line 4655  sub get_domain_handler {
          }
          if (&untie_domain_hash($hashref)) {
              $qresult=~s/\&$//;
-             &Reply($client, "$qresult\n", $userinput);
+             &Reply($client, \$qresult, $userinput);
          } else {
              &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
                        "while attempting getdom\n",$userinput);
- Line 3586  sub get_domain_handler {
+ Line 4669  sub get_domain_handler {
  }
  &register_handler("getdom", \&get_domain_handler, 0, 1, 0);
  #
  #  Puts an id to a domains id database.
  #
- Line 3670  sub get_id_handler {
+ Line 4752  sub get_id_handler {
  	}
  	if (&untie_domain_hash($hashref)) {
  	    $qresult=~s/\&$//;
- 	    &Reply($client, "$qresult\n", $userinput);
+ 	    &Reply($client, \$qresult, $userinput);
  	} else {
  	    &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
  		      "while attempting idget\n",$userinput);
- Line 3684  sub get_id_handler {
+ Line 4766  sub get_id_handler {
  }
  &register_handler("idget", \&get_id_handler, 0, 1, 0);
+ #   Deletes one or more ids in a domain's id database.
+ #
+ #   Parameters:
+ #       $cmd                  - Command keyword (iddel).
+ #       $tail                 - Command tail.  In this case a colon
+ #                               separated list containing:
+ #                               The domain for which we are deleting the id(s).
+ #                               &-separated list of id(s) to delete.
+ #       $client               - File open on client socket.
+ # Returns:
+ #     1   - Continue processing
+ #     0   - Exit server.
+ #
+ #
+ sub del_id_handler {
+     my ($cmd,$tail,$client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($udom,$what)=split(/:/,$tail);
+     chomp($what);
+     my $hashref = &tie_domain_hash($udom, "ids", &GDBM_WRCREAT(),
+                                    "D", $what);
+     if ($hashref) {
+         my @keys=split(/\&/,$what);
+         foreach my $key (@keys) {
+             delete($hashref->{$key});
+         }
+         if (&untie_user_hash($hashref)) {
+             &Reply($client, "ok\n", $userinput);
+         } else {
+             &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
+                     "while attempting iddel\n", $userinput);
+         }
+     } else {
+         &Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
+                  "while attempting iddel\n", $userinput);
+     }
+     return 1;
+ }
+ &register_handler("iddel", \&del_id_handler, 0, 1, 0);
  #
  # Puts broadcast e-mail sent by Domain Coordinator in nohist_dcmail database
  #
- Line 3704  sub get_id_handler {
+ Line 4829  sub get_id_handler {
  sub put_dcmail_handler {
      my ($cmd,$tail,$client) = @_;
      my $userinput = "$cmd:$tail";
      my ($udom,$what)=split(/:/,$tail);
      chomp($what);
      my $hashref = &tie_domain_hash($udom, "nohist_dcmail", &GDBM_WRCREAT());
- Line 3794  sub dump_dcmail_handler {
+ Line 4920  sub dump_dcmail_handler {
          }
          if (&untie_domain_hash($hashref)) {
              chop($qresult);
-             &Reply($client, "$qresult\n", $userinput);
+             &Reply($client, \$qresult, $userinput);
          } else {
              &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
                      "while attempting dcmaildump\n", $userinput);
- Line 3893  sub dump_domainroles_handler {
+ Line 5019  sub dump_domainroles_handler {
          $rolesfilter=&unescape($rolesfilter);
  	@roles = split(/\&/,$rolesfilter);
      }
      my $hashref = &tie_domain_hash($udom, "nohist_domainroles", &GDBM_WRCREAT());
      if ($hashref) {
          my $qresult = '';
          while (my ($key,$value) = each(%$hashref)) {
              my $match = 1;
-             my ($start,$end) = split(/:/,&unescape($value));
+             my ($end,$start) = split(/:/,&unescape($value));
              my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,&unescape($key));
-             unless ($startfilter eq '.' || !defined($startfilter)) {
+             unless (@roles < 1) {
-                 if ($start >= $startfilter) {
+                 unless (grep/^\Q$trole\E$/,@roles) {
                      $match = 0;
+                     next;
                  }
              }
-             unless ($endfilter eq '.' || !defined($endfilter)) {
+             unless ($startfilter eq '.' || !defined($startfilter)) {
-                 if ($end <= $endfilter) {
+                 if ((defined($start)) && ($start >= $startfilter)) {
                      $match = 0;
+                     next;
                  }
              }
-             unless (@roles < 1) {
+             unless ($endfilter eq '.' || !defined($endfilter)) {
-                 unless (grep/^$trole$/,@roles) {
+                 if ((defined($end)) && (($end > 0) && ($end <= $endfilter))) {
                      $match = 0;
+                     next;
                  }
              }
              if ($match == 1) {
- Line 3922  sub dump_domainroles_handler {
+ Line 5051  sub dump_domainroles_handler {
          }
          if (&untie_domain_hash($hashref)) {
              chop($qresult);
-             &Reply($client, "$qresult\n", $userinput);
+             &Reply($client, \$qresult, $userinput);
          } else {
              &Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
                      "while attempting domrolesdump\n", $userinput);
- Line 3965  sub tmp_put_handler {
+ Line 5094  sub tmp_put_handler {
      }
      my ($id,$store);
      $tmpsnum++;
-     if ($context eq 'resetpw') {
+     if (($context eq 'resetpw') || ($context eq 'createaccount')) {
          $id = &md5_hex(&md5_hex(time.{}.rand().$$));
      } else {
          $id = $$.'_'.$clientip.'_'.$tmpsnum;
- Line 3976  sub tmp_put_handler {
+ Line 5105  sub tmp_put_handler {
      if ($store=IO::File->new(">$execdir/tmp/$id.tmp")) {
  	print $store $record;
  	close $store;
- 	&Reply($client, "$id\n", $userinput);
+ 	&Reply($client, \$id, $userinput);
      } else {
  	&Failure( $client, "error: ".($!+0)."IO::File->new Failed ".
  		  "while attempting tmpput\n", $userinput);
- Line 4010  sub tmp_get_handler {
+ Line 5139  sub tmp_get_handler {
      my $execdir=$perlvar{'lonDaemons'};
      if ($store=IO::File->new("$execdir/tmp/$id.tmp")) {
  	my $reply=<$store>;
- 	&Reply( $client, "$reply\n", $userinput);
+ 	&Reply( $client, \$reply, $userinput);
  	close $store;
      } else {
  	&Failure( $client, "error: ".($!+0)."IO::File->new Failed ".
- Line 4056  sub tmp_del_handler {
+ Line 5185  sub tmp_del_handler {
  &register_handler("tmpdel", \&tmp_del_handler, 0, 1, 0);
  #
+ #  Process the delbalcookie command. This command deletes a balancer
+ #  cookie in the lonBalancedir directory created by switchserver
+ #
+ # Parameters:
+ #   $cmd      - Command that got us here.
+ #   $cookie   - Cookie to be deleted.
+ #   $client   - socket open on the client process.
+ #
+ # Returns:
+ #   1     - Indicating processing should continue.
+ # Side Effects:
+ #   A cookie file is deleted from the lonBalancedir directory
+ #   A reply is sent to the client.
+ sub del_balcookie_handler {
+     my ($cmd, $cookie, $client) = @_;
+     my $userinput= "$cmd:$cookie";
+     chomp($cookie);
+     my $deleted = '';
+     if ($cookie =~ /^$LONCAPA::match_domain\_$LONCAPA::match_username\_[a-f0-9]{32}$/) {
+         my $execdir=$perlvar{'lonBalanceDir'};
+         if (-e "$execdir/$cookie.id") {
+             if (open(my $fh,'<',"$execdir/$cookie.id")) {
+                 my $dodelete;
+                 while (my $line = <$fh>) {
+                     chomp($line);
+                     if ($line eq $clientname) {
+                         $dodelete = 1;
+                         last;
+                     }
+                 }
+                 close($fh);
+                 if ($dodelete) {
+                     if (unlink("$execdir/$cookie.id")) {
+                         $deleted = 1;
+                     }
+                 }
+             }
+         }
+     }
+     if ($deleted) {
+         &Reply($client, "ok\n", $userinput);
+     } else {
+         &Failure( $client, "error: ".($!+0)."Unlinking cookie file Failed ".
+                   "while attempting delbalcookie\n", $userinput);
+     }
+     return 1;
+ }
+ &register_handler("delbalcookie", \&del_balcookie_handler, 0, 1, 0);
+ #
  #   Processes the setannounce command.  This command
  #   creates a file named announce.txt in the top directory of
  #   the documentn root and sets its contents.  The announce.txt file is
- Line 4194  sub enrollment_enabled_handler {
+ Line 5375  sub enrollment_enabled_handler {
      my ($cdom) = split(/:/, $tail, 2);   # Domain we're asking about.
      my $outcome  = &localenroll::run($cdom);
-     &Reply($client, "$outcome\n", $userinput);
+     &Reply($client, \$outcome, $userinput);
      return 1;
  }
  &register_handler("autorun", \&enrollment_enabled_handler, 0, 1, 0);
+ #
+ #   Validate an institutional code used for a LON-CAPA course.
+ #
+ # Formal Parameters:
+ #   $cmd          - The command request that got us dispatched.
+ #   $tail         - The tail of the command.  In this case,
+ #                   this is a colon separated set of words that will be split
+ #                   into:
+ #                        $dom      - The domain for which the check of
+ #                                    institutional course code will occur.
+ #
+ #                        $instcode - The institutional code for the course
+ #                                    being requested, or validated for rights
+ #                                    to request.
+ #
+ #                        $owner    - The course requestor (who will be the
+ #                                    course owner, in the form username:domain
+ #
+ #   $client       - Socket open on the client.
+ # Returns:
+ #    1           - Indicating processing should continue.
+ #
+ sub validate_instcode_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($dom,$instcode,$owner) = split(/:/, $tail);
+     $instcode = &unescape($instcode);
+     $owner = &unescape($owner);
+     my ($outcome,$description,$credits) =
+         &localenroll::validate_instcode($dom,$instcode,$owner);
+     my $result = &escape($outcome).'&'.&escape($description).'&'.
+                  &escape($credits);
+     &Reply($client, \$result, $userinput);
+     return 1;
+ }
+ &register_handler("autovalidateinstcode", \&validate_instcode_handler, 0, 1, 0);
  #   Get the official sections for which auto-enrollment is possible.
  #   Since the admin people won't know about 'unofficial sections'
  #   we cannot auto-enroll on them.
- Line 4221  sub get_sections_handler {
+ Line 5440  sub get_sections_handler {
      my @secs = &localenroll::get_sections($coursecode,$cdom);
      my $seclist = &escape(join(':',@secs));
-     &Reply($client, "$seclist\n", $userinput);
+     &Reply($client, \$seclist, $userinput);
      return 1;
- Line 4246  sub get_sections_handler {
+ Line 5465  sub get_sections_handler {
  sub validate_course_owner_handler {
      my ($cmd, $tail, $client)  = @_;
      my $userinput = "$cmd:$tail";
-     my ($inst_course_id, $owner, $cdom) = split(/:/, $tail);
+     my ($inst_course_id, $owner, $cdom, $coowners) = split(/:/, $tail);
      $owner = &unescape($owner);
-     my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
+     $coowners = &unescape($coowners);
-     &Reply($client, "$outcome\n", $userinput);
+     my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom,$coowners);
+     &Reply($client, \$outcome, $userinput);
- Line 4281  sub validate_course_section_handler {
+ Line 5501  sub validate_course_section_handler {
      my ($inst_course_id, $cdom) = split(/:/, $tail);
      my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
-     &Reply($client, "$outcome\n", $userinput);
+     &Reply($client, \$outcome, $userinput);
      return 1;
- Line 4295  sub validate_course_section_handler {
+ Line 5515  sub validate_course_section_handler {
  # Formal Parameters:
  #    $cmd     - The command request that got us dispatched.
  #    $tail    - The tail of the command.   In this case this is a colon separated
- #               set of words that will be split into:
+ #               set of values that will be split into:
  #               $inst_class  - Institutional code for the specific class section
- #               $courseowner - The escaped username:domain of the course owner
+ #               $ownerlist   - An escaped comma-separated list of username:domain
+ #                              of the course owner, and co-owner(s).
  #               $cdom        - The domain of the course from the institution's
  #                              point of view.
  #    $client  - The socket open on the client.
- Line 4308  sub validate_course_section_handler {
+ Line 5529  sub validate_course_section_handler {
  sub validate_class_access_handler {
      my ($cmd, $tail, $client) = @_;
      my $userinput = "$cmd:$tail";
-     my ($inst_class,$courseowner,$cdom) = split(/:/, $tail);
+     my ($inst_class,$ownerlist,$cdom) = split(/:/, $tail);
-     $courseowner = &unescape($courseowner);
+     my $owners = &unescape($ownerlist);
      my $outcome;
      eval {
  	local($SIG{__DIE__})='DEFAULT';
- 	$outcome=&localenroll::check_section($inst_class,$courseowner,$cdom);
+ 	$outcome=&localenroll::check_section($inst_class,$owners,$cdom);
      };
-     &Reply($client,"$outcome\n", $userinput);
+     &Reply($client,\$outcome, $userinput);
      return 1;
  }
  &register_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);
  #
+ #   Validate course owner or co-owners(s) access to enrollment data for all sections
+ #   and crosslistings for a particular course.
+ #
+ #
+ # Formal Parameters:
+ #    $cmd     - The command request that got us dispatched.
+ #    $tail    - The tail of the command.   In this case this is a colon separated
+ #               set of values that will be split into:
+ #               $ownerlist   - An escaped comma-separated list of username:domain
+ #                              of the course owner, and co-owner(s).
+ #               $cdom        - The domain of the course from the institution's
+ #                              point of view.
+ #               $classes     - Frozen hash of institutional course sections and
+ #                              crosslistings.
+ #    $client  - The socket open on the client.
+ # Returns:
+ #    1 - continue processing.
+ #
+ sub validate_classes_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($ownerlist,$cdom,$classes) = split(/:/, $tail);
+     my $classesref = &Apache::lonnet::thaw_unescape($classes);
+     my $owners = &unescape($ownerlist);
+     my $result;
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         my %validations;
+         my $response = &localenroll::check_instclasses($owners,$cdom,$classesref,
+                                                        \%validations);
+         if ($response eq 'ok') {
+             foreach my $key (keys(%validations)) {
+                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($validations{$key}).'&';
+             }
+             $result =~ s/\&$//;
+         } else {
+             $result = 'error';
+         }
+     };
+     if (!$@) {
+         &Reply($client, \$result, $userinput);
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+     return 1;
+ }
+ &register_handler("autovalidateinstclasses", \&validate_classes_handler, 0, 1, 0);
+ #
  #   Create a password for a new LON-CAPA user added by auto-enrollment.
  #   Only used for case where authentication method for new user is localauth
  #
- Line 4356  sub create_auto_enroll_password_handler
+ Line 5627  sub create_auto_enroll_password_handler
  &register_handler("autocreatepassword", \&create_auto_enroll_password_handler,
 , 1, 0);
+ sub auto_export_grades_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($cdom,$cnum,$info,$data) = split(/:/,$tail);
+     my $inforef = &Apache::lonnet::thaw_unescape($info);
+     my $dataref = &Apache::lonnet::thaw_unescape($data);
+     my ($outcome,$result);;
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         my %rtnhash;
+         $outcome=&localenroll::export_grades($cdom,$cnum,$inforef,$dataref,\%rtnhash);
+         if ($outcome eq 'ok') {
+             foreach my $key (keys(%rtnhash)) {
+                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';
+             }
+             $result =~ s/\&$//;
+         }
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             if ($cipher) {
+                 my $cmdlength=length($result);
+                 $result.="         ";
+                 my $encresult='';
+                 for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
+                     $encresult.= unpack("H16",
+                                         $cipher->encrypt(substr($result,
+                                                                 $encidx,
+)));
+                 }
+                 &Reply( $client, "enc:$cmdlength:$encresult\n", $userinput);
+             } else {
+                 &Failure( $client, "error:no_key\n", $userinput);
+             }
+         } else {
+             &Reply($client, "$outcome\n", $userinput);
+         }
+     } else {
+         &Failure($client,"export_error\n",$userinput);
+     }
+     return 1;
+ }
+ &register_handler("autoexportgrades", \&auto_export_grades_handler,
+, 1, 0);
  #   Retrieve and remove temporary files created by/during autoenrollment.
  #
  # Formal Parameters:
  #    $cmd      - The command that got us dispatched.
  #    $tail     - The tail of the command.  In our case this is a colon
  #                separated list that will be split into:
- #                $filename - The name of the file to remove.
+ #                $filename - The name of the file to retrieve.
  #                            The filename is given as a path relative to
  #                            the LonCAPA temp file directory.
  #    $client   - Socket open on the client.
- Line 4376  sub retrieve_auto_file_handler {
+ Line 5693  sub retrieve_auto_file_handler {
      my ($filename)   = split(/:/, $tail);
      my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
-     if ( (-e $source) && ($filename ne '') ) {
+     if ($filename =~m{/\.\./}) {
+         &Failure($client, "refused\n", $userinput);
+     } elsif ($filename !~ /^$LONCAPA::match_domain\_$LONCAPA::match_courseid\_.+_classlist\.xml$/) {
+         &Failure($client, "refused\n", $userinput);
+     } elsif ( (-e $source) && ($filename ne '') ) {
  	my $reply = '';
  	if (open(my $fh,$source)) {
  	    while (<$fh>) {
- Line 4403  sub retrieve_auto_file_handler {
+ Line 5724  sub retrieve_auto_file_handler {
  }
  &register_handler("autoretrieve", \&retrieve_auto_file_handler, 0,1,0);
+ sub crsreq_checks_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my $dom = $tail;
+     my $result;
+     my @reqtypes = ('official','unofficial','community','textbook');
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         my %validations;
+         my $response = &localenroll::crsreq_checks($dom,\@reqtypes,
+                                                    \%validations);
+         if ($response eq 'ok') {
+             foreach my $key (keys(%validations)) {
+                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($validations{$key}).'&';
+             }
+             $result =~ s/\&$//;
+         } else {
+             $result = 'error';
+         }
+     };
+     if (!$@) {
+         &Reply($client, \$result, $userinput);
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+     return 1;
+ }
+ &register_handler("autocrsreqchecks", \&crsreq_checks_handler, 0, 1, 0);
+ sub validate_crsreq_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$customdata) = split(/:/, $tail);
+     $instcode = &unescape($instcode);
+     $owner = &unescape($owner);
+     $crstype = &unescape($crstype);
+     $inststatuslist = &unescape($inststatuslist);
+     $instcode = &unescape($instcode);
+     $instseclist = &unescape($instseclist);
+     my $custominfo = &Apache::lonnet::thaw_unescape($customdata);
+     my $outcome;
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::validate_crsreq($dom,$owner,$crstype,
+                                                  $inststatuslist,$instcode,
+                                                  $instseclist,$custominfo);
+     };
+     if (!$@) {
+         &Reply($client, \$outcome, $userinput);
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+     return 1;
+ }
+ &register_handler("autocrsreqvalidation", \&validate_crsreq_handler, 0, 1, 0);
+ sub crsreq_update_handler {
+     my ($cmd, $tail, $client) = @_;
+     my $userinput = "$cmd:$tail";
+     my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,$code,
+         $accessstart,$accessend,$infohashref) =
+         split(/:/, $tail);
+     $crstype = &unescape($crstype);
+     $action = &unescape($action);
+     $ownername = &unescape($ownername);
+     $ownerdomain = &unescape($ownerdomain);
+     $fullname = &unescape($fullname);
+     $title = &unescape($title);
+     $code = &unescape($code);
+     $accessstart = &unescape($accessstart);
+     $accessend = &unescape($accessend);
+     my $incoming = &Apache::lonnet::thaw_unescape($infohashref);
+     my ($result,$outcome);
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         my %rtnhash;
+         $outcome = &localenroll::crsreq_updates($cdom,$cnum,$crstype,$action,
+                                                 $ownername,$ownerdomain,$fullname,
+                                                 $title,$code,$accessstart,$accessend,
+                                                 $incoming,\%rtnhash);
+         if ($outcome eq 'ok') {
+             my @posskeys = qw(createdweb createdmsg createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript);
+             foreach my $key (keys(%rtnhash)) {
+                 if (grep(/^\Q$key\E/,@posskeys)) {
+                     $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';
+                 }
+             }
+             $result =~ s/\&$//;
+         }
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             &Reply($client, \$result, $userinput);
+         } else {
+             &Reply($client, "format_error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+     return 1;
+ }
+ &register_handler("autocrsrequpdate", \&crsreq_update_handler, 0, 1, 0);
  #
  #   Read and retrieve institutional code format (for support form).
  # Formal Parameters:
- Line 4476  sub get_institutional_defaults_handler {
+ Line 5900  sub get_institutional_defaults_handler {
                  $result.=&escape($key).'='.&escape($value).'&';
              }
              $result .= 'code_order='.&escape(join('&',@code_order));
-             &Reply($client,$result."\n",$userinput);
+             &Reply($client,\$result,$userinput);
          } else {
              &Reply($client,"error\n", $userinput);
          }
- Line 4487  sub get_institutional_defaults_handler {
+ Line 5911  sub get_institutional_defaults_handler {
  &register_handler("autoinstcodedefaults",
                    \&get_institutional_defaults_handler,0,1,0);
+ sub get_possible_instcodes_handler {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my $reply;
+     my $cdom = $tail;
+     my (@codetitles,%cat_titles,%cat_order,@code_order);
+     my $formatreply = &localenroll::possible_instcodes($cdom,
+                                                        \@codetitles,
+                                                        \%cat_titles,
+                                                        \%cat_order,
+                                                        \@code_order);
+     if ($formatreply eq 'ok') {
+         my $result = join('&',map {&escape($_);} (@codetitles)).':';
+         $result .= join('&',map {&escape($_);} (@code_order)).':';
+         foreach my $key (keys(%cat_titles)) {
+             $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($cat_titles{$key}).'&';
+         }
+         $result =~ s/\&$//;
+         $result .= ':';
+         foreach my $key (keys(%cat_order)) {
+             $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($cat_order{$key}).'&';
+         }
+         $result =~ s/\&$//;
+         &Reply($client,\$result,$userinput);
+     } else {
+         &Reply($client, "format_error\n", $userinput);
+     }
+     return 1;
+ }
+ &register_handler("autopossibleinstcodes",
+                   \&get_possible_instcodes_handler,0,1,0);
+ sub get_institutional_user_rules {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my $dom = &unescape($tail);
+     my (%rules_hash,@rules_order);
+     my $outcome;
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::username_rules($dom,\%rules_hash,\@rules_order);
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             my $result;
+             foreach my $key (keys(%rules_hash)) {
+                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+             }
+             $result =~ s/\&$//;
+             $result .= ':';
+             if (@rules_order > 0) {
+                 foreach my $item (@rules_order) {
+                     $result .= &escape($item).'&';
+                 }
+             }
+             $result =~ s/\&$//;
+             &Reply($client,\$result,$userinput);
+         } else {
+             &Reply($client,"error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+ }
+ &register_handler("instuserrules",\&get_institutional_user_rules,0,1,0);
+ sub get_institutional_id_rules {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my $dom = &unescape($tail);
+     my (%rules_hash,@rules_order);
+     my $outcome;
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::id_rules($dom,\%rules_hash,\@rules_order);
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             my $result;
+             foreach my $key (keys(%rules_hash)) {
+                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+             }
+             $result =~ s/\&$//;
+             $result .= ':';
+             if (@rules_order > 0) {
+                 foreach my $item (@rules_order) {
+                     $result .= &escape($item).'&';
+                 }
+             }
+             $result =~ s/\&$//;
+             &Reply($client,\$result,$userinput);
+         } else {
+             &Reply($client,"error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+ }
+ &register_handler("instidrules",\&get_institutional_id_rules,0,1,0);
+ sub get_institutional_selfcreate_rules {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my $dom = &unescape($tail);
+     my (%rules_hash,@rules_order);
+     my $outcome;
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::selfcreate_rules($dom,\%rules_hash,\@rules_order);
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             my $result;
+             foreach my $key (keys(%rules_hash)) {
+                 $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rules_hash{$key}).'&';
+             }
+             $result =~ s/\&$//;
+             $result .= ':';
+             if (@rules_order > 0) {
+                 foreach my $item (@rules_order) {
+                     $result .= &escape($item).'&';
+                 }
+             }
+             $result =~ s/\&$//;
+             &Reply($client,\$result,$userinput);
+         } else {
+             &Reply($client,"error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+ }
+ &register_handler("instemailrules",\&get_institutional_selfcreate_rules,0,1,0);
+ sub institutional_username_check {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my %rulecheck;
+     my $outcome;
+     my ($udom,$uname,@rules) = split(/:/,$tail);
+     $udom = &unescape($udom);
+     $uname = &unescape($uname);
+     @rules = map {&unescape($_);} (@rules);
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::username_check($udom,$uname,\@rules,\%rulecheck);
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             my $result='';
+             foreach my $key (keys(%rulecheck)) {
+                 $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+             }
+             &Reply($client,\$result,$userinput);
+         } else {
+             &Reply($client,"error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+ }
+ &register_handler("instrulecheck",\&institutional_username_check,0,1,0);
+ sub institutional_id_check {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my %rulecheck;
+     my $outcome;
+     my ($udom,$id,@rules) = split(/:/,$tail);
+     $udom = &unescape($udom);
+     $id = &unescape($id);
+     @rules = map {&unescape($_);} (@rules);
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::id_check($udom,$id,\@rules,\%rulecheck);
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             my $result='';
+             foreach my $key (keys(%rulecheck)) {
+                 $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+             }
+             &Reply($client,\$result,$userinput);
+         } else {
+             &Reply($client,"error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+ }
+ &register_handler("instidrulecheck",\&institutional_id_check,0,1,0);
+ sub institutional_selfcreate_check {
+     my ($cmd, $tail, $client)   = @_;
+     my $userinput               = "$cmd:$tail";
+     my %rulecheck;
+     my $outcome;
+     my ($udom,$email,@rules) = split(/:/,$tail);
+     $udom = &unescape($udom);
+     $email = &unescape($email);
+     @rules = map {&unescape($_);} (@rules);
+     eval {
+         local($SIG{__DIE__})='DEFAULT';
+         $outcome = &localenroll::selfcreate_check($udom,$email,\@rules,\%rulecheck);
+     };
+     if (!$@) {
+         if ($outcome eq 'ok') {
+             my $result='';
+             foreach my $key (keys(%rulecheck)) {
+                 $result.=&escape($key).'='.&Apache::lonnet::freeze_escape($rulecheck{$key}).'&';
+             }
+             &Reply($client,\$result,$userinput);
+         } else {
+             &Reply($client,"error\n", $userinput);
+         }
+     } else {
+         &Failure($client,"unknown_cmd\n",$userinput);
+     }
+ }
+ &register_handler("instselfcreatecheck",\&institutional_selfcreate_check,0,1,0);
  # Get domain specific conditions for import of student photographs to a course
  #
- Line 4639  sub inst_usertypes_handler {
+ Line 6285  sub inst_usertypes_handler {
          }
          $res=~s/\&$//;
      }
-     &Reply($client, "$res\n", $userinput);
+     &Reply($client, \$res, $userinput);
      return 1;
  }
  &register_handler("inst_usertypes", \&inst_usertypes_handler, 0, 1, 0);
- Line 4888  sub lcpasswdstrerror {
+ Line 6534  sub lcpasswdstrerror {
      }
  }
- #
- # Convert an error return code from lcuseradd to a string value:
- #
- sub lcuseraddstrerror {
-     my $ErrorCode = shift;
-     if(($ErrorCode < 0) || ($ErrorCode > $lastadderror)) {
- 	return "lcuseradd - Unrecognized error code: ".$ErrorCode;
-     } else {
- 	return $adderrors[$ErrorCode];
-     }
- }
  # grabs exception and records it to log before exiting
  sub catchexception {
      my ($error)=@_;
- Line 4907  sub catchexception {
+ Line 6541  sub catchexception {
      $SIG{__DIE__}='DEFAULT';
      &status("Catching exception");
      &logthis("<font color='red'>CRITICAL: "
-      ."ABNORMAL EXIT. Child $$ for server $thisserver died through "
+      ."ABNORMAL EXIT. Child $$ for server ".$perlvar{'lonHostID'}." died through "
       ."a crash with this error msg->[$error]</font>");
      &logthis('Famous last words: '.$status.' - '.$lastlog);
      if ($client) { print $client "error: $error\n"; }
- Line 4936  my $wwwid=getpwnam('www');
+ Line 6570  my $wwwid=getpwnam('www');
  if ($wwwid!=$<) {
     my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
     my $subj="LON: $currenthostid User ID mismatch";
-    system("echo 'User ID mismatch.  lond must be run as user www.' |\
+    system("echo 'User ID mismatch.  lond must be run as user www.' |".
-  mailto $emailto -s '$subj' > /dev/null");
+           " mail -s '$subj' $emailto > /dev/null");
     exit 1;
  }
- Line 4960  if (-e $pidfile) {
+ Line 6594  if (-e $pidfile) {
  $server = IO::Socket::INET->new(LocalPort => $perlvar{'londPort'},
                                  Type      => SOCK_STREAM,
                                  Proto     => 'tcp',
-                                 Reuse     => 1,
+                                 ReuseAddr     => 1,
                                  Listen    => 10 )
    or die "making socket: $@\n";
- Line 5023  sub HUPSMAN {                      # sig
+ Line 6657  sub HUPSMAN {                      # sig
  #  a setuid perl script that can be root for us to do this job.
  #
  sub ReloadApache {
-     my $execdir = $perlvar{'lonDaemons'};
+ # --------------------------- Handle case of another apachereload process (locking)
-     my $script  = $execdir."/apachereload";
+     if (&LONCAPA::try_to_lock('/tmp/lock_apachereload')) {
-     system($script);
+         my $execdir = $perlvar{'lonDaemons'};
+         my $script  = $execdir."/apachereload";
+         system($script);
+         unlink('/tmp/lock_apachereload'); #  Remove the lock file.
+     }
  }
  #
- Line 5048  sub UpdateHosts {
+ Line 6686  sub UpdateHosts {
      #  either dropped or changed hosts.  Note that the re-read of the table
      #  will take care of new and changed hosts as connections come into being.
-     #FIXME need a way to tell lonnet that it needs to reset host
+     &Apache::lonnet::reset_hosts_info();
-     #cached host info
      foreach my $child (keys(%children)) {
  	my $childip = $children{$child};
- 	if (defined(&Apache::lonnet::get_hosts_from_ip($childip))) {
+ 	if ($childip ne '127.0.0.1'
+ 	    && !defined(&Apache::lonnet::get_hosts_from_ip($childip))) {
  	    logthis('<font color="blue"> UpdateHosts killing child '
  		    ." $child for ip $childip </font>");
  	    kill('INT', $child);
- Line 5138  sub Debug {
+ Line 6776  sub Debug {
  #
  sub Reply {
      my ($fd, $reply, $request) = @_;
-     print $fd $reply;
+     if (ref($reply)) {
-     Debug("Request was $request  Reply was $reply");
+ 	print $fd $$reply;
+ 	print $fd "\n";
+ 	if ($DEBUG) { Debug("Request was $request  Reply was $$reply"); }
+     } else {
+ 	print $fd $reply;
+ 	if ($DEBUG) { Debug("Request was $request  Reply was $reply"); }
+     }
      $Transactions++;
  }
- Line 5193  sub logstatus {
+ Line 6836  sub logstatus {
  sub initnewstatus {
      my $docdir=$perlvar{'lonDocRoot'};
      my $fh=IO::File->new(">$docdir/lon-status/londstatus.txt");
-     my $now=time;
+     my $now=time();
      my $local=localtime($now);
      print $fh "LOND status $local - parent $$\n\n";
      opendir(DIR,"$docdir/lon-status/londchld");
- Line 5282  $SIG{USR2} = \&UpdateHosts;
+ Line 6925  $SIG{USR2} = \&UpdateHosts;
  #  Read the host hashes:
  &Apache::lonnet::load_hosts_tab();
+ my %iphost = &Apache::lonnet::get_iphost(1);
+ $dist=`$perlvar{'lonDaemons'}/distprobe`;
- my $dist=`$perlvar{'lonDaemons'}/distprobe`;
+ my $arch = `uname -i`;
+ chomp($arch);
+ if ($arch eq 'unknown') {
+     $arch = `uname -m`;
+     chomp($arch);
+ }
  # --------------------------------------------------------------
  #   Accept connections.  When a connection comes in, it is validated
- Line 5342  sub make_new_child {
+ Line 6993  sub make_new_child {
              or die "Can't unblock SIGINT for fork: $!\n";
          $children{$pid} = $clientip;
          &status('Started child '.$pid);
+ 	close($client);
          return;
      } else {
          # Child can *not* return from this subroutine.
- Line 5350  sub make_new_child {
+ Line 7002  sub make_new_child {
                                  #don't get intercepted
          $SIG{USR1}= \&logstatus;
          $SIG{ALRM}= \&timeout;
+ 	#
+ 	# Block sigpipe as it gets thrownon socket disconnect and we want to
+ 	# deal with that as a read faiure instead.
+ 	#
+ 	my $blockset = POSIX::SigSet->new(SIGPIPE);
+ 	sigprocmask(SIG_BLOCK, $blockset);
          $lastlog='Forked ';
          $status='Forked';
- Line 5360  sub make_new_child {
+ Line 7019  sub make_new_child {
  #        my $tmpsnum=0;            # Now global
  #---------------------------------------------------- kerberos 5 initialization
          &Authen::Krb5::init_context();
- 	unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||
- 		($dist eq 'fedora6') || ($dist eq 'suse9.3')) {
+         my $no_ets;
- 	    &Authen::Krb5::init_ets();
+         if ($dist =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
- 	}
+             if ($1 >= 7) {
+                 $no_ets = 1;
+             }
+         } elsif ($dist =~ /^suse(\d+\.\d+)$/) {
+             if (($1 eq '9.3') || ($1 >= 12.2)) {
+                 $no_ets = 1;
+             }
+         } elsif ($dist =~ /^sles(\d+)$/) {
+             if ($1 > 11) {
+                 $no_ets = 1;
+             }
+         } elsif ($dist =~ /^fedora(\d+)$/) {
+             if ($1 < 7) {
+                 $no_ets = 1;
+             }
+         }
+         unless ($no_ets) {
+             &Authen::Krb5::init_ets();
+         }
  	&status('Accepted connection');
  # =============================================================================
- Line 5371  sub make_new_child {
+ Line 7048  sub make_new_child {
  # -----------------------------------------------------------------------------
  	# see if we know client and 'check' for spoof IP by ineffective challenge
- 	ReadManagerTable;	# May also be a manager!!
  	my $outsideip=$clientip;
  	if ($clientip eq '127.0.0.1') {
  	    $outsideip=&Apache::lonnet::get_host_ip($perlvar{'lonHostID'});
  	}
+ 	&ReadManagerTable();
  	my $clientrec=defined(&Apache::lonnet::get_hosts_from_ip($outsideip));
  	my $ismanager=($managers{$outsideip}    ne undef);
- 	$clientname  = "[unknonwn]";
+ 	$clientname  = "[unknown]";
  	if($clientrec) {	# Establish client type.
  	    $ConnectionType = "client";
  	    $clientname = (&Apache::lonnet::get_hosts_from_ip($outsideip))[-1];
- Line 5408  sub make_new_child {
+ Line 7083  sub make_new_child {
  		#
  		#  If the remote is attempting a local init... give that a try:
  		#
- 		my ($i, $inittype) = split(/:/, $remotereq);
+ 		(my $i, my $inittype, $clientversion) = split(/:/, $remotereq);
+                 # For LON-CAPA 2.9, the  client session will have sent its LON-CAPA
+                 # version when initiating the connection. For LON-CAPA 2.8 and older,
+                 # the version is retrieved from the global %loncaparevs in lonnet.pm.
+                 # $clientversion contains path to keyfile if $inittype eq 'local'
+                 # it's overridden below in this case
+                 $clientversion ||= $Apache::lonnet::loncaparevs{$clientname};
  		# If the connection type is ssl, but I didn't get my
  		# certificate files yet, then I'll drop  back to
- Line 5428  sub make_new_child {
+ Line 7109  sub make_new_child {
  		}
  		if($inittype eq "local") {
+                     $clientversion = $perlvar{'lonVersion'};
  		    my $key = LocalConnection($client, $remotereq);
  		    if($key) {
  			Debug("Got local key $key");
- Line 5435  sub make_new_child {
+ Line 7117  sub make_new_child {
  			my $cipherkey = pack("H32", $key);
  			$cipher       = new IDEA($cipherkey);
  			print $client "ok:local\n";
- 			&logthis('<font color="green"'
+ 			&logthis('<font color="green">'
  				 . "Successful local authentication </font>");
  			$keymode = "local"
  		    } else {
- Line 5472  sub make_new_child {
+ Line 7154  sub make_new_child {
  				  ."Attempted insecure connection disallowed </font>");
  			close $client;
  			$clientok = 0;
  		    }
  		}
  	    } else {
- Line 5481  sub make_new_child {
+ Line 7162  sub make_new_child {
  			 ."$clientip failed to initialize: >$remotereq< </font>");
  		&status('No init '.$clientip);
  	    }
  	} else {
  	    &logthis(
  		     "<font color='blue'>WARNING: Unknown client $clientip</font>");
- Line 5492  sub make_new_child {
+ Line 7172  sub make_new_child {
  # ---------------- New known client connecting, could mean machine online again
  	    if (&Apache::lonnet::get_host_ip($currenthostid) ne $clientip
  		&& $clientip ne '127.0.0.1') {
- 		&Apache::lonnet::reconlonc();
+ 		&Apache::lonnet::reconlonc($clientname);
  	    }
  	    &logthis("<font color='green'>Established connection: $clientname</font>");
  	    &status('Will listen to '.$clientname);
  # ------------------------------------------------------------ Process requests
  	    my $keep_going = 1;
  	    my $user_input;
+             my $clienthost = &Apache::lonnet::hostname($clientname);
+             my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);
+             $clienthomedom = &Apache::lonnet::host_domain($clientserverhomeID);
  	    while(($user_input = get_request) && $keep_going) {
  		alarm(120);
  		Debug("Main: Got $user_input\n");
- Line 5548  sub is_author {
+ Line 7231  sub is_author {
      #  Author role should show up as a key /domain/_au
-     my $key    = "/$domain/_au";
      my $value;
-     if (defined($hashref)) {
+     if ($hashref) {
- 	$value = $hashref->{$key};
-     }
-     if(defined($value)) {
+ 	my $key    = "/$domain/_au";
- 	&Debug("$user @ $domain is an author");
+ 	if (defined($hashref)) {
+ 	    $value = $hashref->{$key};
+ 	    if(!untie_user_hash($hashref)) {
+ 		return 'error: ' .  ($!+0)." untie (GDBM) Failed";
+ 	    }
+ 	}
+ 	if(defined($value)) {
+ 	    &Debug("$user @ $domain is an author");
+ 	}
+     } else {
+ 	return 'error: '.($!+0)." tie (GDBM) Failed";
      }
      return defined($value);
  }
  #
  #   Checks to see if the input roleput request was to set
- # an author role.  If so, invokes the lchtmldir script to set
+ # an author role.  If so, creates construction space
- # up a correct public_html
  # Parameters:
  #    request   - The request sent to the rolesput subchunk.
  #                We're looking for  /domain/_au
- Line 5573  sub is_author {
+ Line 7263  sub is_author {
  #
  sub manage_permissions {
      my ($request, $domain, $user, $authtype) = @_;
-     &Debug("manage_permissions: $request $domain $user $authtype");
      # See if the request is of the form /$domain/_au
      if($request =~ /^(\/\Q$domain\E\/_au)$/) { # It's an author rolesput...
- 	my $execdir = $perlvar{'lonDaemons'};
+         my $path=$perlvar{'lonDocRoot'}."/priv/$domain";
- 	my $userhome= "/home/$user" ;
+         unless (-e $path) {
- 	&logthis("system $execdir/lchtmldir $userhome $user $authtype");
+            mkdir($path);
- 	&Debug("Setting homedir permissions for $userhome");
+         }
- 	system("$execdir/lchtmldir $userhome $user $authtype");
+         unless (-e $path.'/'.$user) {
+            mkdir($path.'/'.$user);
+         }
      }
  }
- Line 5630  sub password_filename {
+ Line 7319  sub password_filename {
  #    domain    - domain of the user.
  #    name      - User's name.
  #    contents  - New contents of the file.
+ #    saveold   - (optional). If true save old file in a passwd.bak file.
  # Returns:
  #   0    - Failed.
  #   1    - Success.
  #
  sub rewrite_password_file {
-     my ($domain, $user, $contents) = @_;
+     my ($domain, $user, $contents, $saveold) = @_;
      my $file = &password_filename($domain, $user);
      if (defined $file) {
+         if ($saveold) {
+             my $bakfile = $file.'.bak';
+             if (CopyFile($file,$bakfile)) {
+                 chmod(0400,$bakfile);
+                 &logthis("Old password saved in passwd.bak for internally authenticated user: $user:$domain");
+             } else {
+                 &logthis("Failed to save old password in passwd.bak for internally authenticated user: $user:$domain");
+             }
+         }
  	my $pf = IO::File->new(">$file");
  	if($pf) {
  	    print $pf "$contents\n";
- Line 5657  sub rewrite_password_file {
+ Line 7356  sub rewrite_password_file {
  #     Returns the authorization type or nouser if there is no such user.
  #
- sub get_auth_type
+ sub get_auth_type {
- {
      my ($domain, $user)  = @_;
      Debug("get_auth_type( $domain, $user ) \n");
- Line 5695  sub get_auth_type
+ Line 7392  sub get_auth_type
  #     0        - The domain,user,password triplet is not a valid user.
  #
  sub validate_user {
-     my ($domain, $user, $password) = @_;
+     my ($domain, $user, $password, $checkdefauth) = @_;
      # Why negative ~pi you may well ask?  Well this function is about
      # authentication, and therefore very important to get right.
- Line 5719  sub validate_user {
+ Line 7415  sub validate_user {
      my $null = pack("C",0);	# Used by kerberos auth types.
+     if ($howpwd eq 'nouser') {
+         if ($checkdefauth) {
+             my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+             if ($domdefaults{'auth_def'} eq 'localauth') {
+                 $howpwd = $domdefaults{'auth_def'};
+                 $contentpwd = $domdefaults{'auth_arg_def'};
+             } elsif ((($domdefaults{'auth_def'} eq 'krb4') ||
+                       ($domdefaults{'auth_def'} eq 'krb5')) &&
+                      ($domdefaults{'auth_arg_def'} ne '')) {
+                 $howpwd = $domdefaults{'auth_def'};
+                 $contentpwd = $domdefaults{'auth_arg_def'};
+             }
+         }
+     }
      if ($howpwd ne 'nouser') {
  	if($howpwd eq "internal") { # Encrypted is in local password file.
- 	    $validated = (crypt($password, $contentpwd) eq $contentpwd);
+             if (length($contentpwd) == 13) {
+                 $validated = (crypt($password,$contentpwd) eq $contentpwd);
+                 if ($validated) {
+                     my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+                     if ($domdefaults{'intauth_switch'}) {
+                         my $ncpass = &hash_passwd($domain,$password);
+                         my $saveold;
+                         if ($domdefaults{'intauth_switch'} == 2) {
+                             $saveold = 1;
+                         }
+                         if (&rewrite_password_file($domain,$user,"$howpwd:$ncpass",$saveold)) {
+                             &update_passwd_history($user,$domain,$howpwd,'conversion');
+                             &logthis("Validated password hashed with bcrypt for $user:$domain");
+                         }
+                     }
+                 }
+             } else {
+                 $validated = &check_internal_passwd($password,$contentpwd,$domain,$user);
+             }
  	}
  	elsif ($howpwd eq "unix") { # User is a normal unix user.
  	    $contentpwd = (getpwnam($user))[1];
- Line 5742  sub validate_user {
+ Line 7469  sub validate_user {
  	    } else {
  		$validated = 0;
  	    }
- 	}
+ 	} elsif ($howpwd eq "krb4") { # user is in kerberos 4 auth. domain.
- 	elsif ($howpwd eq "krb4") { # user is in kerberos 4 auth. domain.
+             my $checkwithkrb5 = 0;
- 	    if(! ($password =~ /$null/) ) {
+             if ($dist =~/^fedora(\d+)$/) {
- 		my $k4error = &Authen::Krb4::get_pw_in_tkt($user,
+                 if ($1 > 11) {
- 							   "",
+                     $checkwithkrb5 = 1;
- 							   $contentpwd,,
+                 }
- 							   'krbtgt',
+             } elsif ($dist =~ /^suse([\d.]+)$/) {
- 							   $contentpwd,
+                 if ($1 > 11.1) {
-,
+                     $checkwithkrb5 = 1;
- 							   $password);
+                 }
- 		if(!$k4error) {
+             }
- 		    $validated = 1;
+             if ($checkwithkrb5) {
- 		} else {
+                 $validated = &krb5_authen($password,$null,$user,$contentpwd);
- 		    $validated = 0;
+             } else {
- 		    &logthis('krb4: '.$user.', '.$contentpwd.', '.
+                 $validated = &krb4_authen($password,$null,$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.
+             $validated = &krb5_authen($password,$null,$user,$contentpwd);
- 		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(&Authen::Krb5::parse_name($user.'@'
-                                                                  .$contentpwd));
- 		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,
- Line 5809  sub validate_user {
+ Line 7517  sub validate_user {
      return $validated;
  }
+ sub check_internal_passwd {
+     my ($plainpass,$stored,$domain,$user) = @_;
+     my (undef,$method,@rest) = split(/!/,$stored);
+     if ($method eq 'bcrypt') {
+         my $result = &hash_passwd($domain,$plainpass,@rest);
+         if ($result ne $stored) {
+             return 0;
+         }
+         my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+         if ($domdefaults{'intauth_check'}) {
+             # Upgrade to a larger number of rounds if necessary
+             my $defaultcost = $domdefaults{'intauth_cost'};
+             if (($defaultcost eq '') || ($defaultcost =~ /D/)) {
+                 $defaultcost = 10;
+             }
+             if (int($rest[0])<int($defaultcost)) {
+                 if ($domdefaults{'intauth_check'} == 1) {
+                     my $ncpass = &hash_passwd($domain,$plainpass);
+                     if (&rewrite_password_file($domain,$user,"internal:$ncpass")) {
+                         &update_passwd_history($user,$domain,'internal','update cost');
+                         &logthis("Validated password hashed with bcrypt for $user:$domain");
+                     }
+                     return 1;
+                 } elsif ($domdefaults{'intauth_check'} == 2) {
+                     return 0;
+                 }
+             }
+         } else {
+             return 1;
+         }
+     }
+     return 0;
+ }
+ sub get_last_authchg {
+     my ($domain,$user) = @_;
+     my $lastmod;
+     my $logname = &propath($domain,$user).'/passwd.log';
+     if (-e "$logname") {
+         $lastmod = (stat("$logname"))[9];
+     }
+     return $lastmod;
+ }
+ sub krb4_authen {
+     my ($password,$null,$user,$contentpwd) = @_;
+     my $validated = 0;
+     if (!($password =~ /$null/) ) {  # Null password not allowed.
+         eval {
+             require Authen::Krb4;
+         };
+         if (!$@) {
+             my $k4error = &Authen::Krb4::get_pw_in_tkt($user,
+                                                        "",
+                                                        $contentpwd,,
+                                                        'krbtgt',
+                                                        $contentpwd,
+,
+                                                        $password);
+             if(!$k4error) {
+                 $validated = 1;
+             } else {
+                 $validated = 0;
+                 &logthis('krb4: '.$user.', '.$contentpwd.', '.
+                           &Authen::Krb4::get_err_txt($Authen::Krb4::error));
+             }
+         } else {
+             $validated = krb5_authen($password,$null,$user,$contentpwd);
+         }
+     }
+     return $validated;
+ }
+ sub krb5_authen {
+     my ($password,$null,$user,$contentpwd) = @_;
+     my $validated = 0;
+     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(&Authen::Krb5::parse_name($user.'@'
+                                                             .$contentpwd));
+         my $krbreturn;
+         if (exists(&Authen::Krb5::get_init_creds_password)) {
+             $krbreturn =
+                 &Authen::Krb5::get_init_creds_password($krbclient,$password,
+                                                           $krbservice);
+             $validated = (ref($krbreturn) eq 'Authen::Krb5::Creds');
+         } else {
+             $krbreturn  =
+                 &Authen::Krb5::get_in_tkt_with_password($krbclient,$krbserver,
+                                                          $password,$credentials);
+             $validated = ($krbreturn == 1);
+         }
+         if (!$validated) {
+             &logthis('krb5: '.$user.', '.$contentpwd.', '.
+                      &Authen::Krb5::error());
+         }
+     }
+     return $validated;
+ }
  sub addline {
      my ($fname,$hostid,$ip,$newline)=@_;
- Line 6021  sub subscribe {
+ Line 7832  sub subscribe {
                  # the metadata
  		unless ($fname=~/\.meta$/) { &unsub("$fname.meta",$clientip); }
  		$fname=~s/\/home\/httpd\/html\/res/raw/;
- 		$fname="http://$thisserver/".$fname;
+                 my $protocol = $Apache::lonnet::protocol{$perlvar{'lonHostID'}};
+                 $protocol = 'http' if ($protocol ne 'https');
+ 		$fname=$protocol.'://'.&Apache::lonnet::hostname($perlvar{'lonHostID'})."/".$fname;
  		$result="$fname\n";
  	    }
  	} else {
- Line 6063  sub change_unix_password {
+ Line 7876  sub change_unix_password {
  sub make_passwd_file {
-     my ($uname, $umode,$npass,$passfilename)=@_;
+     my ($uname,$udom,$umode,$npass,$passfilename,$action)=@_;
-     my $result="ok\n";
+     my $result="ok";
      if ($umode eq 'krb4' or $umode eq 'krb5') {
  	{
  	    my $pf = IO::File->new(">$passfilename");
  	    if ($pf) {
  		print $pf "$umode:$npass\n";
+                 &update_passwd_history($uname,$udom,$umode,$action);
  	    } else {
  		$result = "pass_file_failed_error";
  	    }
  	}
      } elsif ($umode eq 'internal') {
- 	my $salt=time;
+         my $ncpass = &hash_passwd($udom,$npass);
- 	$salt=substr($salt,6,2);
- 	my $ncpass=crypt($npass,$salt);
  	{
  	    &Debug("Creating internal auth");
  	    my $pf = IO::File->new(">$passfilename");
  	    if($pf) {
  		print $pf "internal:$ncpass\n";
+                 &update_passwd_history($uname,$udom,$umode,$action);
  	    } else {
  		$result = "pass_file_failed_error";
  	    }
- Line 6092  sub make_passwd_file {
+ Line 7905  sub make_passwd_file {
  	    my $pf = IO::File->new(">$passfilename");
  	    if($pf) {
  		print $pf "localauth:$npass\n";
+                 &update_passwd_history($uname,$udom,$umode,$action);
  	    } else {
  		$result = "pass_file_failed_error";
  	    }
  	}
      } elsif ($umode eq 'unix') {
- 	{
+ 	&logthis(">>>Attempt to create unix account blocked -- unix auth not available for new users.");
- 	    #
+ 	$result="no_new_unix_accounts";
- 	    #  Don't allow the creation of privileged accounts!!! that would
- 	    #  be real bad!!!
- 	    #
- 	    my $uid = getpwnam($uname);
- 	    if((defined $uid) && ($uid == 0)) {
- 		&logthis(">>>Attempted to create privilged account blocked");
- 		return "no_priv_account_error\n";
- 	    }
- 	    my $execpath       ="$perlvar{'lonDaemons'}/"."lcuseradd";
- 	    my $lc_error_file  = $execdir."/tmp/lcuseradd".$$.".status";
- 	    {
- 		&Debug("Executing external: ".$execpath);
- 		&Debug("user  = ".$uname.", Password =". $npass);
- 		my $se = IO::File->new("|$execpath > $perlvar{'lonDaemons'}/logs/lcuseradd.log");
- 		print $se "$uname\n";
- 		print $se "$npass\n";
- 		print $se "$npass\n";
- 		print $se "$lc_error_file\n"; # Status -> unique file.
- 	    }
- 	    if (-r $lc_error_file) {
- 		&Debug("Opening error file: $lc_error_file");
- 		my $error = IO::File->new("< $lc_error_file");
- 		my $useraddok = <$error>;
- 		$error->close;
- 		unlink($lc_error_file);
- 		chomp $useraddok;
- 		if($useraddok > 0) {
- 		    my $error_text = &lcuseraddstrerror($useraddok);
- 		    &logthis("Failed lcuseradd: $error_text");
- 		    $result = "lcuseradd_failed:$error_text\n";
- 		}  else {
- 		    my $pf = IO::File->new(">$passfilename");
- 		    if($pf) {
- 			print $pf "unix:\n";
- 		    } else {
- 			$result = "pass_file_failed_error";
- 		    }
- 		}
- 	    }  else {
- 		&Debug("Could not locate lcuseradd error: $lc_error_file");
- 		$result="bug_lcuseradd_no_output_file";
- 	    }
- 	}
      } elsif ($umode eq 'none') {
  	{
  	    my $pf = IO::File->new("> $passfilename");
- Line 6156  sub make_passwd_file {
+ Line 7923  sub make_passwd_file {
  	    }
  	}
      } else {
- 	$result="auth_mode_error\n";
+ 	$result="auth_mode_error";
      }
      return $result;
  }
- Line 6179  sub sethost {
+ Line 7946  sub sethost {
  	eq &Apache::lonnet::get_host_ip($hostid)) {
  	$currenthostid  =$hostid;
  	$currentdomainid=&Apache::lonnet::host_domain($hostid);
- 	&logthis("Setting hostid to $hostid, and domain to $currentdomainid");
+ #	&logthis("Setting hostid to $hostid, and domain to $currentdomainid");
      } else {
  	&logthis("Requested host id $hostid not an alias of ".
  		 $perlvar{'lonHostID'}." refusing connection");
- Line 6194  sub version {
+ Line 7961  sub version {
      return "version:$VERSION";
  }
+ sub get_usersession_config {
+     my ($dom,$name) = @_;
+     my ($usersessionconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
+     if (defined($cached)) {
+         return $usersessionconf;
+     } else {
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);
+         if (ref($domconfig{'usersessions'}) eq 'HASH') {
+             &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'usersessions'},3600);
+             return $domconfig{'usersessions'};
+         }
+     }
+     return;
+ }
+ sub get_usersearch_config {
+     my ($dom,$name) = @_;
+     my ($usersearchconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
+     if (defined($cached)) {
+         return $usersearchconf;
+     } else {
+         my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$dom);
+         &Apache::lonnet::do_cache_new($name,$dom,$domconfig{'directorysrch'},3600);
+         return $domconfig{'directorysrch'};
+     }
+     return;
+ }
+ sub distro_and_arch {
+     return $dist.':'.$arch;
+ }
  # ----------------------------------- POD (plain old documentation, CPAN style)
- Line 6402  Place in B<logs/lond.log>
+ Line 8200  Place in B<logs/lond.log>
  stores hash in namespace
- =item rolesputy
+ =item rolesput
  put a role into a user's environment
- Line 6528  linux
+ Line 8326  linux
  Server/Process
  =cut
+ =pod
+ =head1 LOG MESSAGES
+ The messages below can be emitted in the lond log.  This log is located
+ in ~httpd/perl/logs/lond.log  Many log messages have HTML encapsulation
+ to provide coloring if examined from inside a web page. Some do not.
+ Where color is used, the colors are; Red for sometihhng to get excited
+ about and to follow up on. Yellow for something to keep an eye on to
+ be sure it does not get worse, Green,and Blue for informational items.
+ In the discussions below, sometimes reference is made to ~httpd
+ when describing file locations.  There isn't really an httpd
+ user, however there is an httpd directory that gets installed in the
+ place that user home directories go.  On linux, this is usually
+ (always?) /home/httpd.
+ Some messages are colorless.  These are usually (not always)
+ Green/Blue color level messages.
+ =over 2
+ =item (Red)  LocalConnection rejecting non local: <ip> ne 127.0.0.1
+ A local connection negotiation was attempted by
+ a host whose IP address was not 127.0.0.1.
+ The socket is closed and the child will exit.
+ lond has three ways to establish an encyrption
+ key with a client:
+ =over 2
+ =item local
+ The key is written and read from a file.
+ This is only valid for connections from localhost.
+ =item insecure
+ The key is generated by the server and
+ transmitted to the client.
+ =item  ssl (secure)
+ An ssl connection is negotiated with the client,
+ the key is generated by the server and sent to the
+ client across this ssl connection before the
+ ssl connectionis terminated and clear text
+ transmission resumes.
+ =back
+ =item (Red) LocalConnection: caller is insane! init = <init> and type = <type>
+ The client is local but has not sent an initialization
+ string that is the literal "init:local"  The connection
+ is closed and the child exits.
+ =item Red CRITICAL Can't get key file <error>
+ SSL key negotiation is being attempted but the call to
+ lonssl::KeyFile  failed.  This usually means that the
+ configuration file is not correctly defining or protecting
+ the directories/files lonCertificateDirectory or
+ lonnetPrivateKey
+ <error> is a string that describes the reason that
+ the key file could not be located.
+ =item (Red) CRITICAL  Can't get certificates <error>
+ SSL key negotiation failed because we were not able to retrives our certificate
+ or the CA's certificate in the call to lonssl::CertificateFile
+ <error> is the textual reason this failed.  Usual reasons:
+ =over 2
+ =item Apache config file for loncapa  incorrect:
+ one of the variables
+ lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate
+ undefined or incorrect
+ =item Permission error:
+ The directory pointed to by lonCertificateDirectory is not readable by lond
+ =item Permission error:
+ Files in the directory pointed to by lonCertificateDirectory are not readable by lond.
+ =item Installation error:
+ Either the certificate authority file or the certificate have not
+ been installed in lonCertificateDirectory.
+ =item (Red) CRITICAL SSL Socket promotion failed:  <err>
+ The promotion of the connection from plaintext to SSL failed
+ <err> is the reason for the failure.  There are two
+ system calls involved in the promotion (one of which failed),
+ a dup to produce
+ a second fd on the raw socket over which the encrypted data
+ will flow and IO::SOcket::SSL->new_from_fd which creates
+ the SSL connection on the duped fd.
+ =item (Blue)   WARNING client did not respond to challenge
+ This occurs on an insecure (non SSL) connection negotiation request.
+ lond generates some number from the time, the PID and sends it to
+ the client.  The client must respond by echoing this information back.
+ If the client does not do so, that's a violation of the challenge
+ protocols and the connection will be failed.
+ =item (Red) No manager table. Nobody can manage!!
+ lond has the concept of privileged hosts that
+ can perform remote management function such
+ as update the hosts.tab.   The manager hosts
+ are described in the
+ ~httpd/lonTabs/managers.tab file.
+ this message is logged if this file is missing.
+ =item (Green) Registering manager <dnsname> as <cluster_name> with <ipaddress>
+ Reports the successful parse and registration
+ of a specific manager.
+ =item Green existing host <clustername:dnsname>
+ The manager host is already defined in the hosts.tab
+ the information in that table, rather than the info in the
+ manager table will be used to determine the manager's ip.
+ =item (Red) Unable to craete <filename>
+ lond has been asked to create new versions of an administrative
+ file (by a manager).  When this is done, the new file is created
+ in a temp file and then renamed into place so that there are always
+ usable administrative files, even if the update fails.  This failure
+ message means that the temp file could not be created.
+ The update is abandoned, and the old file is available for use.
+ =item (Green) CopyFile from <oldname> to <newname> failed
+ In an update of administrative files, the copy of the existing file to a
+ backup file failed.  The installation of the new file may still succeed,
+ but there will not be a back up file to rever to (this should probably
+ be yellow).
+ =item (Green) Pushfile: backed up <oldname> to <newname>
+ See above, the backup of the old administrative file succeeded.
+ =item (Red)  Pushfile: Unable to install <filename> <reason>
+ The new administrative file could not be installed.  In this case,
+ the old administrative file is still in use.
+ =item (Green) Installed new < filename>.
+ The new administrative file was successfullly installed.
+ =item (Red) Reinitializing lond pid=<pid>
+ The lonc child process <pid> will be sent a USR2
+ signal.
+ =item (Red) Reinitializing self
+ We've been asked to re-read our administrative files,and
+ are doing so.
+ =item (Yellow) error:Invalid process identifier <ident>
+ A reinit command was received, but the target part of the
+ command was not valid.  It must be either
+ 'lond' or 'lonc' but was <ident>
+ =item (Green) isValideditCommand checking: Command = <command> Key = <key> newline = <newline>
+ Checking to see if lond has been handed a valid edit
+ command.  It is possible the edit command is not valid
+ in that case there are no log messages to indicate that.
+ =item Result of password change for  <username> pwchange_success
+ The password for <username> was
+ successfully changed.
+ =item Unable to open <user> passwd to change password
+ Could not rewrite the
+ internal password file for a user
+ =item Result of password change for <user> : <result>
+ A unix password change for <user> was attempted
+ and the pipe returned <result>
+ =item LWP GET: <message> for <fname> (<remoteurl>)
+ The lightweight process fetch for a resource failed
+ with <message> the local filename that should
+ have existed/been created was  <fname> the
+ corresponding URI: <remoteurl>  This is emitted in several
+ places.
+ =item Unable to move <transname> to <destname>
+ From fetch_user_file_handler - the user file was replicated but could not
+ be mv'd to its final location.
+ =item Looking for <domain> <username>
+ From user_has_session_handler - This should be a Debug call instead
+ it indicates lond is about to check whether the specified user has a
+ session active on the specified domain on the local host.
+ =item Client <ip> (<name>) hanging up: <input>
+ lond has been asked to exit by its client.  The <ip> and <name> identify the
+ client systemand <input> is the full exit command sent to the server.
+ =item Red CRITICAL: ABNORMAL EXIT. child <pid> for server <hostname> died through a crass with this error->[<message>].
+ A lond child terminated.  NOte that this termination can also occur when the
+ child receives the QUIT or DIE signals.  <pid> is the process id of the child,
+ <hostname> the host lond is working for, and <message> the reason the child died
+ to the best of our ability to get it (I would guess that any numeric value
+ represents and errno value).  This is immediately followed by
+ =item  Famous last words: Catching exception - <log>
+ Where log is some recent information about the state of the child.
+ =item Red CRITICAL: TIME OUT <pid>
+ Some timeout occured for server <pid>.  THis is normally a timeout on an LWP
+ doing an HTTP::GET.
+ =item child <pid> died
+ The reaper caught a SIGCHILD for the lond child process <pid>
+ This should be modified to also display the IP of the dying child
+ $children{$pid}
+ =item Unknown child 0 died
+ A child died but the wait for it returned a pid of zero which really should not
+ ever happen.
+ =item Child <which> - <pid> looks like we missed it's death
+ When a sigchild is received, the reaper process checks all children to see if they are
+ alive.  If children are dying quite quickly, the lack of signal queuing can mean
+ that a signal hearalds the death of more than one child.  If so this message indicates
+ which other one died. <which> is the ip of a dead child
+ =item Free socket: <shutdownretval>
+ The HUNTSMAN sub was called due to a SIGINT in a child process.  The socket is being shutdown.
+ for whatever reason, <shutdownretval> is printed but in fact shutdown() is not documented
+ to return anything. This is followed by:
+ =item Red CRITICAL: Shutting down
+ Just prior to exit.
+ =item Free socket: <shutdownretval>
+ The HUPSMAN sub was called due to a SIGHUP.  all children get killsed, and lond execs itself.
+ This is followed by:
+ =item (Red) CRITICAL: Restarting
+ lond is about to exec itself to restart.
+ =item (Blue) Updating connections
+ (In response to a USR2).  All the children (except the one for localhost)
+ are about to be killed, the hosts tab reread, and Apache reloaded via apachereload.
+ =item (Blue) UpdateHosts killing child <pid> for ip <ip>
+ Due to USR2 as above.
+ =item (Green) keeping child for ip <ip> (pid = <pid>)
+ In response to USR2 as above, the child indicated is not being restarted because
+ it's assumed that we'll always need a child for the localhost.
+ =item Going to check on the children
+ Parent is about to check on the health of the child processes.
+ Note that this is in response to a USR1 sent to the parent lond.
+ there may be one or more of the next two messages:
+ =item <pid> is dead
+ A child that we have in our child hash as alive has evidently died.
+ =item  Child <pid> did not respond
+ In the health check the child <pid> did not update/produce a pid_.txt
+ file when sent it's USR1 signal.  That process is killed with a 9 signal, as it's
+ assumed to be hung in some un-fixable way.
+ =item Finished checking children
+ Master processs's USR1 processing is cojmplete.
+ =item (Red) CRITICAL: ------- Starting ------
+ (There are more '-'s on either side).  Lond has forked itself off to
+ form a new session and is about to start actual initialization.
+ =item (Green) Attempting to start child (<client>)
+ Started a new child process for <client>.  Client is IO::Socket object
+ connected to the child.  This was as a result of a TCP/IP connection from a client.
+ =item Unable to determine who caller was, getpeername returned nothing
+ In child process initialization.  either getpeername returned undef or
+ a zero sized object was returned.  Processing continues, but in my opinion,
+ this should be cause for the child to exit.
+ =item Unable to determine clientip
+ In child process initialization.  The peer address from getpeername was not defined.
+ The client address is stored as "Unavailable" and processing continues.
+ =item (Yellow) INFO: Connection <ip> <name> connection type = <type>
+ In child initialization.  A good connectionw as received from <ip>.
+ =over 2
+ =item <name>
+ is the name of the client from hosts.tab.
+ =item <type>
+ Is the connection type which is either
+ =over 2
+ =item manager
+ The connection is from a manager node, not in hosts.tab
+ =item client
+ the connection is from a non-manager in the hosts.tab
+ =item both
+ The connection is from a manager in the hosts.tab.
+ =back
+ =back
+ =item (Blue) Certificates not installed -- trying insecure auth
+ One of the certificate file, key file or
+ certificate authority file could not be found for a client attempting
+ SSL connection intiation.  COnnection will be attemptied in in-secure mode.
+ (this would be a system with an up to date lond that has not gotten a
+ certificate from us).
+ =item (Green)  Successful local authentication
+ A local connection successfully negotiated the encryption key.
+ In this case the IDEA key is in a file (that is hopefully well protected).
+ =item (Green) Successful ssl authentication with <client>
+ The client (<client> is the peer's name in hosts.tab), has successfully
+ negotiated an SSL connection with this child process.
+ =item (Green) Successful insecure authentication with <client>
+ The client has successfully negotiated an  insecure connection withthe child process.
+ =item (Yellow) Attempted insecure connection disallowed
+ The client attempted and failed to successfully negotiate a successful insecure
+ connection.  This can happen either because the variable londAllowInsecure is false
+ or undefined, or becuse the child did not successfully echo back the challenge
+ string.
+ =back
+ =back
+ =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.370
changed lines
	Added in v.1.489.2.34