--- loncom/lond	2006/02/10 09:48:17	1.305.2.4
+++ loncom/lond	2006/05/31 14:46:48	1.305.2.7
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.305.2.4 2006/02/10 09:48:17 albertel Exp $
+# $Id: lond,v 1.305.2.7 2006/05/31 14:46:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@ my $status='';
 my $lastlog='';
 my $lond_max_wait_time = 13;
 
-my $VERSION='$Revision: 1.305.2.4 $'; #' stupid emacs
+my $VERSION='$Revision: 1.305.2.7 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -2290,8 +2290,11 @@ sub token_auth_user_file_handler {
     my $reply="non_auth\n";
     if (open(ENVIN,$perlvar{'lonIDsDir'}.'/'.
 	     $session.'.id')) {
+	flock(ENVIN,LOCK_SH);
 	while (my $line=<ENVIN>) {
-	    if ($line=~ m|userfile\.\Q$fname\E\=|) { $reply="ok\n"; }
+	    my ($envname)=split(/=/,$line,2);
+	    $envname=&unescape($envname);
+	    if ($envname=~ m|^userfile\.\Q$fname\E|) { $reply="ok\n"; }
 	}
 	close(ENVIN);
 	&Reply($client, $reply, "$cmd:$tail");
@@ -5149,7 +5152,7 @@ sub sub_sql_reply {
                                       Type    => SOCK_STREAM,
                                       Timeout => 10)
        or return "con_lost";
-    print $sclient "$cmd\n";
+    print $sclient "$cmd:$currentdomainid\n";
     my $answer=<$sclient>;
     chomp($answer);
     if (!$answer) { $answer="con_lost"; }