--- loncom/lond	2000/12/29 21:11:03	1.34
+++ loncom/lond	2001/03/22 13:28:15	1.38
@@ -10,6 +10,9 @@
 # 06/29,06/30,07/14,07/15,07/17,07/20,07/25,09/18 Gerd Kortemeyer
 # 12/05 Scott Harrison
 # 12/05,12/13,12/29 Gerd Kortemeyer
+# Jan 01 Scott Harrison
+# 02/12 Gerd Kortemeyer
+# 03/15 Scott Harrison
 #
 # based on "Perl Cookbook" ISBN 1-56592-243-3
 # preforker - server who forks first
@@ -57,6 +60,16 @@ while ($configline=<CONFIG>) {
 }
 close(CONFIG);
 
+# ----------------------------- Make sure this process is running from user=www
+my $wwwid=getpwnam('www');
+if ($wwwid!=$<) {
+   $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   $subj="LON: $perlvar{'lonHostID'} User ID mismatch";
+   system("echo 'User ID mismatch.  lond must be run as user www.' |\
+ mailto $emailto -s '$subj' > /dev/null");
+   exit 1;
+}
+
 # --------------------------------------------- Check if other instance running
 
 my $pidfile="$perlvar{'lonDaemons'}/logs/lond.pid";
@@ -905,7 +918,8 @@ sub make_new_child {
                                $allkeys.=$key.':';
                                $hash{"$version:$rid:$key"}=$value;
                            }
-                           $allkeys=~s/:$//;
+                           $hash{"$version:$rid:timestamp"}=$now;
+                           $allkeys.='timestamp';
                            $hash{"$version:keys:$rid"}=$allkeys;
 			   if (untie(%hash)) {
                               print $client "ok\n";
@@ -953,7 +967,8 @@ sub make_new_child {
                    } elsif ($userinput =~ /^querysend/) {
                        my ($cmd,$query)=split(/:/,$userinput);
 		       $query=~s/\n*$//g;
-                     print $client sqlreply("$hostid{$clientip}\&$query")."\n";
+		       print $client sqlreply("$hostid{$clientip}\&$query").
+			             "\n";
 # ------------------------------------------------------------------ queryreply
                    } elsif ($userinput =~ /^queryreply/) {
                        my ($cmd,$id,$reply)=split(/:/,$userinput);