[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / lond

[raeburn]

raeburn		Mon Jul  1 14:58:42 2024 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	lond 
  Log:
  - For 2.11
    Backport 1.580, 1.581
  
  
Index: loncom/lond
diff -u loncom/lond:1.489.2.45 loncom/lond:1.489.2.46
--- loncom/lond:1.489.2.45	Sun Feb 27 02:13:24 2022
+++ loncom/lond	Mon Jul  1 14:58:42 2024
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.45 2022/02/27 02:13:24 raeburn Exp $
+# $Id: lond,v 1.489.2.46 2024/07/01 14:58:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.45 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.46 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -6810,7 +6810,7 @@
 # ----------------------------- Make sure this process is running from user=www
 my $wwwid=getpwnam('www');
 if ($wwwid!=$<) {
-   my $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}";
+   my $emailto="$perlvar{'lonAdmEMail'} $perlvar{'lonSysEMail'}";
    my $subj="LON: $currenthostid User ID mismatch";
    system("echo 'User ID mismatch.  lond must be run as user www.' |".
           " mail -s '$subj' $emailto > /dev/null");
@@ -8018,6 +8018,9 @@
     if (-e $ulsdir) {
 	if(-d $ulsdir) {
 	    if (opendir(LSDIR,$ulsdir)) {
+                if (-e $fname) {
+                    $version=0;
+                }
 		my $ulsfn;
 		while ($ulsfn=readdir(LSDIR)) {
 # see if this is a regular file (ignore links produced earlier)