--- loncom/lond 2013/05/11 22:42:22 1.489.2.5
+++ loncom/lond 2012/04/26 19:51:40 1.492
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.489.2.5 2013/05/11 22:42:22 raeburn Exp $
+# $Id: lond,v 1.492 2012/04/26 19:51:40 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,7 @@ my $DEBUG = 0; # Non zero to ena
my $status='';
my $lastlog='';
-my $VERSION='$Revision: 1.489.2.5 $'; #' stupid emacs
+my $VERSION='$Revision: 1.492 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid="default";
my $currentdomainid;
@@ -154,8 +154,8 @@ my @adderrors = ("ok",
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",
+ "Source file name does not exist",
+ "Destination file name does not exist",
"Some file operation failed",
"Invalid table filename."
);
@@ -1907,12 +1907,8 @@ sub authenticate_handler {
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,
+ $clientversion,
$remote,$hosted);
}
}
@@ -2374,24 +2370,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);
}
}
@@ -3276,12 +3254,12 @@ sub dump_profile_database {
sub dump_with_regexp {
my ($cmd, $tail, $client) = @_;
- my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);
-
+ my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientname, $clientversion);
+
if ($res =~ /^error:/) {
- &Failure($client, \$res, "$cmd:$tail");
+ Failure($client, \$res, "$cmd:$tail");
} else {
- &Reply($client, \$res, "$cmd:$tail");
+ Reply($client, \$res, "$cmd:$tail");
}
return 1;
@@ -4996,10 +4974,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;
@@ -6224,6 +6201,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)) {
@@ -6470,8 +6450,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 'suse12.3')) {
+ ($dist eq 'fedora6') || ($dist eq 'suse9.3')) {
&Authen::Krb5::init_ets();
}
@@ -6517,12 +6496,10 @@ sub make_new_child {
# If the remote is attempting a local init... give that a try:
#
(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};
+ # 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 ||= $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
@@ -7387,6 +7364,43 @@ sub get_usersession_config {
}
+#
+# get_courseinfo_hash() is used to retrieve course information from the db
+# file: nohist_courseids.db for a course for which the current server is *not*
+# the home server.
+#
+# A hash of a hash will be retrieved. The outer hash contains a single key --
+# courseID -- for the course for which the data are being requested.
+# The contents of the inner hash, for that single item in the outer hash
+# are returned (and cached in memcache for 10 minutes).
+#
+
+sub get_courseinfo_hash {
+ my ($cnum,$cdom,$home) = @_;
+ my %info;
+ eval {
+ local($SIG{ALRM}) = sub { die "timeout\n"; };
+ local($SIG{__DIE__})='DEFAULT';
+ alarm(3);
+ %info = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,1,[$home],'.');
+ alarm(0);
+ };
+ if ($@) {
+ if ($@ eq "timeout\n") {
+ &logthis("WARNING courseiddump for $cnum:$cdom from $home timedout");
+ } else {
+ &logthis("WARNING unexpected error during eval of call for courseiddump from $home");
+ }
+ } else {
+ if (ref($info{$cdom.'_'.$cnum}) eq 'HASH') {
+ my $hashid = $cdom.':'.$cnum;
+ return &Apache::lonnet::do_cache_new('courseinfo',$hashid,$info{$cdom.'_'.$cnum},600);
+ }
+ }
+ return;
+}
+
+
sub distro_and_arch {
return $dist.':'.$arch;
}
@@ -7598,7 +7612,7 @@ Place in B
stores hash in namespace
-=item rolesput
+=item rolesputy
put a role into a user's environment
@@ -7715,6 +7729,8 @@ Authen::Krb5
=head1 COREQUISITES
+none
+
=head1 OSNAMES
linux
@@ -7802,9 +7818,9 @@ or the CA's certificate in the call to l
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
@@ -7923,7 +7939,7 @@ Could not rewrite the
internal password file for a user
=item Result of password change for :
-
+
A unix password change for was attempted
and the pipe returned
@@ -7952,7 +7968,7 @@ lond has been asked to exit by its clien
client systemand is the full exit command sent to the server.
=item Red CRITICAL: ABNORMAL EXIT. child for server died through a crass with this error->[].
-
+
A lond child terminated. NOte that this termination can also occur when the
child receives the QUIT or DIE signals. is the process id of the child,
the host lond is working for, and the reason the child died
@@ -8036,7 +8052,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 ------
@@ -8050,7 +8066,7 @@ Started a new child process for
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.
@@ -8061,7 +8077,7 @@ In child process initialization. The pe
The client address is stored as "Unavailable" and processing continues.
=item (Yellow) INFO: Connection connection type =
-
+
In child initialization. A good connectionw as received from .
=over 2
@@ -8111,7 +8127,7 @@ The client ( is the peer's name
negotiated an SSL connection with this child process.
=item (Green) Successful insecure authentication with
-
+
The client has successfully negotiated an insecure connection withthe child process.