--- loncom/lond 2018/12/02 16:17:21 1.552 +++ loncom/lond 2018/12/11 13:05:40 1.555 @@ -2,7 +2,7 @@ # The LearningOnline Network # lond "LON Daemon" Server (port "LOND" 5663) # -# $Id: lond,v 1.552 2018/12/02 16:17:21 raeburn Exp $ +# $Id: lond,v 1.555 2018/12/11 13:05:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -65,7 +65,7 @@ my $DEBUG = 0; # Non zero to ena my $status=''; my $lastlog=''; -my $VERSION='$Revision: 1.552 $'; #' stupid emacs +my $VERSION='$Revision: 1.555 $'; #' stupid emacs my $remoteVERSION; my $currenthostid="default"; my $currentdomainid; @@ -236,7 +236,7 @@ my %trust = ( edit => {institutiononly => 1}, #not used currently eget => {remote => 1, domroles => 1, enroll => 1}, #not used currently egetdom => {remote => 1, domroles => 1, enroll => 1, }, - ekey => {}, #not used currently + ekey => {anywhere => 1}, exit => {anywhere => 1}, fetchuserfile => {remote => 1, enroll => 1}, get => {remote => 1, domroles => 1, enroll => 1}, @@ -833,8 +833,8 @@ sub PushFile { # hosts.tab ($filename eq host). # domain.tab ($filename eq domain). # dns_hosts.tab ($filename eq dns_host). - # dns_domain.tab ($filename eq dns_domain). - # loncapaCAcrl.pem ($filename eq loncapaCAcrl); + # dns_domain.tab ($filename eq dns_domain). + # loncapaCAcrl.pem ($filename eq loncapaCAcrl). # Construct the destination filename or reject the request. # # lonManage is supposed to ensure this, however this session could be @@ -5552,10 +5552,10 @@ sub del_balcookie_handler { chomp($line); if ($line eq $clientname) { $dodelete = 1; - last; + last; } } - close($fh); + close($fh); if ($dodelete) { if (unlink("$execdir/$cookie.id")) { $deleted = 1; @@ -7099,7 +7099,7 @@ sub UpdateHosts { my %oldconf = %secureconf; my %connchange; - if (lonssl::Read_Connect_Config(\%secureconf,\%crlchecked,\%perlvar) eq 'ok') { + if (lonssl::Read_Connect_Config(\%secureconf,\%perlvar,\%crlchecked) eq 'ok') { logthis(' Reloaded SSL connection rules and cleared CRL checking history '); } else { logthis(' Failed to reload SSL connection rules and clear CRL checking history '); @@ -7381,7 +7381,7 @@ if ($arch eq 'unknown') { chomp($arch); } -unless (lonssl::Read_Connect_Config(\%secureconf,\%crlchecked,\%perlvar) eq 'ok') { +unless (lonssl::Read_Connect_Config(\%secureconf,\%perlvar,\%crlchecked) eq 'ok') { &logthis('No connectionrules table. Will fallback to loncapa.conf'); }