--- loncom/lond 2013/08/04 03:13:39 1.489.2.6 +++ loncom/lond 2012/10/05 15:15:52 1.495 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.489.2.6 2013/08/04 03:13:39 raeburn Exp $ +# $Id: lond,v 1.495 2012/10/05 15:15:52 raeburn 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.6 $'; #' stupid emacs +my $VERSION='$Revision: 1.495 $'; #' 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); } } @@ -3198,6 +3194,17 @@ sub get_profile_keys { sub dump_profile_database { my ($cmd, $tail, $client) = @_; + my $res = LONCAPA::Lond::dump_profile_database($tail); + + if ($res =~ /^error:/) { + Failure($client, \$res, "$cmd:$tail"); + } else { + Reply($client, \$res, "$cmd:$tail"); + } + + return 1; + + #TODO remove my $userinput = "$cmd:$tail"; my ($udom,$uname,$namespace) = split(/:/,$tail); @@ -3277,11 +3284,11 @@ sub dump_with_regexp { my ($cmd, $tail, $client) = @_; my $res = LONCAPA::Lond::dump_with_regexp($tail, $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; @@ -3860,6 +3867,17 @@ sub put_course_id_hash_handler { # a reply is written to $client. sub dump_course_id_handler { my ($cmd, $tail, $client) = @_; + + my $res = LONCAPA::Lond::dump_course_id_handler($tail); + if ($res =~ /^error:/) { + Failure($client, \$res, "$cmd:$tail"); + } else { + Reply($client, \$res, "$cmd:$tail"); + } + + return 1; + + #TODO remove my $userinput = "$cmd:$tail"; my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter, @@ -4448,49 +4466,6 @@ sub get_id_handler { } ®ister_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; -} -®ister_handler("iddel", \&del_id_handler, 0, 1, 0); - # # Puts broadcast e-mail sent by Domain Coordinator in nohist_dcmail database # @@ -5039,10 +5014,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; @@ -6267,6 +6241,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)) { @@ -6513,8 +6490,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(); } @@ -6559,13 +6535,14 @@ sub make_new_child { # # If the remote is attempting a local init... give that a try: # + logthis("remotereq: $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}; + # 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 @@ -7430,6 +7407,8 @@ sub get_usersession_config { } + + sub distro_and_arch { return $dist.':'.$arch; } @@ -7641,7 +7620,7 @@ Place in B stores hash in namespace -=item rolesput +=item rolesputy put a role into a user's environment @@ -7758,6 +7737,8 @@ Authen::Krb5 =head1 COREQUISITES +none + =head1 OSNAMES linux @@ -7845,9 +7826,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 @@ -7966,7 +7947,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 @@ -7995,7 +7976,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 @@ -8079,7 +8060,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 ------ @@ -8093,7 +8074,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. @@ -8104,7 +8085,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 @@ -8154,7 +8135,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.