--- loncom/lond 2013/03/02 03:31:10 1.489.2.3
+++ loncom/lond 2012/04/25 21:22:28 1.491
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.489.2.3 2013/03/02 03:31:10 raeburn Exp $
+# $Id: lond,v 1.491 2012/04/25 21:22:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,6 +34,7 @@ use strict;
use lib '/home/httpd/lib/perl/';
use LONCAPA;
use LONCAPA::Configuration;
+use LONCAPA::Lond;
use IO::Socket;
use IO::File;
@@ -60,7 +61,7 @@ my $DEBUG = 0; # Non zero to ena
my $status='';
my $lastlog='';
-my $VERSION='$Revision: 1.489.2.3 $'; #' stupid emacs
+my $VERSION='$Revision: 1.491 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid="default";
my $currentdomainid;
@@ -2373,24 +2374,6 @@ 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);
}
}
@@ -3275,6 +3258,15 @@ sub dump_profile_database {
sub dump_with_regexp {
my ($cmd, $tail, $client) = @_;
+ #TODO encapsulate $clientname and $clientversion in a object.
+ my $res = LONCAPA::Lond::dump_with_regexp($cmd, $tail, $clientname, $clientversion);
+
+ if ($res =~ /^error:/) {
+ Failure($client, \$res, "$cmd:$tail");
+ } else {
+ Reply($client, \$res, "$cmd:$tail");
+ }
+ return 1;
my $userinput = "$cmd:$tail";
@@ -3302,20 +3294,19 @@ sub dump_with_regexp {
#
# When dump is for roles.db, determine if LON-CAPA version checking is needed.
# Sessions on 2.10 and later do not require version checking, as that occurs
-# on the server hosting the user session, when constructing the roles/courses
+# on the server hosting the user session, when constructing the roles/courses
# screen).
#
my $skipcheck;
my @ids = &Apache::lonnet::current_machine_ids();
my (%homecourses,$major,$minor,$now);
-#
-# If dump is for roles.db from a pre-2.10 server, determine the LON-CAPA
-# version on the server which requested the data. For LON-CAPA 2.9, the
+#
+# If dump is for roles.db from a pre-2.10 server, determine the LON-CAPA
+# version on the server which requested the data. 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.
#
-#
if ($namespace eq 'roles') {
my $loncaparev = $clientversion;
if ($loncaparev eq '') {
@@ -5104,10 +5095,9 @@ sub validate_instcode_handler {
my ($dom,$instcode,$owner) = split(/:/, $tail);
$instcode = &unescape($instcode);
$owner = &unescape($owner);
- my ($outcome,$description,$credits) =
+ my ($outcome,$description) =
&localenroll::validate_instcode($dom,$instcode,$owner);
- my $result = &escape($outcome).'&'.&escape($description).'&'.
- &escape($credits);
+ my $result = &escape($outcome).'&'.&escape($description);
&Reply($client, \$result, $userinput);
return 1;
@@ -6332,6 +6322,9 @@ sub Debug {
# reply - Text to send to client.
# request - Original request from client.
#
+#NOTE $reply must be terminated by exactly *one* \n. If $reply is a reference
+#this is done automatically ($$reply must not contain any \n in this case).
+#If $reply is a string the caller has to ensure this.
sub Reply {
my ($fd, $reply, $request) = @_;
if (ref($reply)) {
@@ -6578,8 +6571,7 @@ sub make_new_child {
#---------------------------------------------------- kerberos 5 initialization
&Authen::Krb5::init_context();
unless (($dist eq 'fedora5') || ($dist eq 'fedora4') ||
- ($dist eq 'fedora6') || ($dist eq 'suse9.3') ||
- ($dist eq 'suse12.2')) {
+ ($dist eq 'fedora6') || ($dist eq 'suse9.3')) {
&Authen::Krb5::init_ets();
}
@@ -7928,7 +7920,7 @@ Place in B<logs/lond.log>
stores hash in namespace
-=item rolesput
+=item rolesputy
put a role into a user's environment
@@ -8045,6 +8037,8 @@ Authen::Krb5
=head1 COREQUISITES
+none
+
=head1 OSNAMES
linux
@@ -8132,9 +8126,9 @@ or the CA's certificate in the call to l
<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
@@ -8253,7 +8247,7 @@ 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>
@@ -8282,7 +8276,7 @@ lond has been asked to exit by its clien
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
@@ -8366,7 +8360,7 @@ file when sent it's USR1 signal. That p
assumed to be hung in some un-fixable way.
=item Finished checking children
-
+
Master processs's USR1 processing is cojmplete.
=item (Red) CRITICAL: ------- Starting ------
@@ -8380,7 +8374,7 @@ Started a new child process for <client>
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.
@@ -8391,7 +8385,7 @@ In child process initialization. The pe
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
@@ -8441,7 +8435,7 @@ The client (<client> is the peer's name
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.