[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework lonmaxima.pm /lonnet/perl lonnet.pm

[raeburn]

raeburn		Mon Aug 19 17:57:05 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/homework	lonmaxima.pm 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11
    Backport 1.1390
  
  
Index: loncom/homework/lonmaxima.pm
diff -u loncom/homework/lonmaxima.pm:1.35 loncom/homework/lonmaxima.pm:1.36
--- loncom/homework/lonmaxima.pm:1.35	Tue Mar  7 01:56:56 2017
+++ loncom/homework/lonmaxima.pm	Tue Mar  7 16:04:35 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Interface routines to MAXIMA CAS
 #
-# $Id: lonmaxima.pm,v 1.35 2017/03/07 01:56:56 raeburn Exp $
+# $Id: lonmaxima.pm,v 1.36 2017/03/07 16:04:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -155,6 +155,9 @@
 
 sub compareterms {
     my ($socket,$terma,$termb)=@_;
+    if ($terma =~ m{\(\s*\([^)]*$}) {
+        return 'Error: blacklisted';
+    }
     my $difference='('.$terma.')-('.$termb.')';
     if (&blacklisted($difference)) { return 'Error: blacklisted'; }
     my $reply=&maximareply($socket,'trigsimp(trigreduce('.$difference.'));');
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.111 loncom/lonnet/perl/lonnet.pm:1.1172.2.112
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.111	Mon Aug 19 17:35:34 2019
+++ loncom/lonnet/perl/lonnet.pm	Mon Aug 19 17:57:03 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.111 2019/08/19 17:35:34 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.112 2019/08/19 17:57:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -897,6 +897,7 @@
 	while ($filename=readdir(LONIDS)) {
 	    next if ($filename eq '.' || $filename eq '..');
 	    next if ($filename =~ /publicuser_\d+\.id/);
+            next if ($filename =~ /^[a-f0-9]+_linked\.id$/);
 	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
 	    if ($curtime-$mtime < 1800) { $numusers++; }
 	}