--- loncom/lonnet/perl/lonnet.pm 2006/01/26 07:14:39 1.703 +++ loncom/lonnet/perl/lonnet.pm 2006/01/31 21:57:59 1.705 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.703 2006/01/26 07:14:39 albertel Exp $ +# $Id: lonnet.pm,v 1.705 2006/01/31 21:57:59 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -124,7 +124,7 @@ sub logperm { # -------------------------------------------------- Non-critical communication sub subreply { my ($cmd,$server)=@_; - my $peerfile="$perlvar{'lonSockDir'}/$server"; + my $peerfile="$perlvar{'lonSockDir'}/".$hostname{$server}; # # With loncnew process trimming, there's a timing hole between lonc server # process exit and the master server picking up the listen on the AF_UNIX @@ -152,7 +152,7 @@ sub subreply { } my $answer; if ($client) { - print $client "$cmd\n"; + print $client "sethost:$server:$cmd\n"; $answer=<$client>; if (!$answer) { $answer="con_lost"; } chomp($answer); @@ -3081,6 +3081,7 @@ sub customaccess { sub allowed { my ($priv,$uri,$symb)=@_; + my $ver_orguri=$uri; $uri=&deversion($uri); my $orguri=$uri; $uri=&declutter($uri); @@ -3181,7 +3182,7 @@ sub allowed { $thisallowed.=$1; } } else { - my $refuri=$env{'httpref.'.$orguri}; + my $refuri = $env{'httpref.'.$orguri} || $env{'httpref.'.$ver_orguri}; if ($refuri) { if ($refuri =~ m|^/adm/|) { $thisallowed='F';