--- loncom/lond	2020/07/19 19:02:39	1.489.2.35.2.2
+++ loncom/lond	2020/05/04 17:08:26	1.489.2.37
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.489.2.35.2.2 2020/07/19 19:02:39 raeburn Exp $
+# $Id: lond,v 1.489.2.37 2020/05/04 17:08:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,7 +63,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.489.2.35.2.2 $'; #' stupid emacs
+my $VERSION='$Revision: 1.489.2.37 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -4593,10 +4593,11 @@ sub course_sessions_handler {
                 my ($uname,$udom) = ($1,$2);
                 next unless (-e "$perlvar{'lonDaemons'}/tmp/$uname$dbsuffix");
                 my $mtime = (stat("$perlvar{'lonIDsDir'}/$filename"))[9];
+                my $since=$now-$mtime;
                 if ($lastactivity < 0) {
-                    next if ($mtime-$now > $lastactivity);
+                    next if ($since <= $lastactivity);
                 } else {
-                    next if ($now-$mtime > $lastactivity);
+                    next if ($since > $lastactivity);
                 }
                 $sessions{$uname.':'.$udom} = $mtime;
             }
@@ -4684,40 +4685,6 @@ sub get_domain_handler {
 
     my ($udom,$namespace,$what)=split(/:/,$tail,3);
     chomp($what);
-    if ($namespace =~ /^enc/) {
-        &Failure( $client, "refused\n", $userinput);
-    } else {
-        my @queries=split(/\&/,$what);
-        my $qresult='';
-        my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER());
-        if ($hashref) {
-            for (my $i=0;$i<=$#queries;$i++) {
-                $qresult.="$hashref->{$queries[$i]}&";
-            }
-            if (&untie_domain_hash($hashref)) {
-                $qresult=~s/\&$//;
-                &Reply($client, \$qresult, $userinput);
-            } else {
-                &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
-                          "while attempting getdom\n",$userinput);
-            }
-        } else {
-            &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
-                     "while attempting getdom\n",$userinput);
-        }
-    }
-
-    return 1;
-}
-&register_handler("getdom", \&get_domain_handler, 0, 1, 0);
-
-sub encrypted_get_domain_handler {
-    my ($cmd, $tail, $client) = @_;
-
-    my $userinput = "$cmd:$tail";
-
-    my ($udom,$namespace,$what)=split(/:/,$tail,3);
-    chomp($what);
     my @queries=split(/\&/,$what);
     my $qresult='';
     my $hashref = &tie_domain_hash($udom, "$namespace", &GDBM_READER());
@@ -4727,31 +4694,19 @@ sub encrypted_get_domain_handler {
         }
         if (&untie_domain_hash($hashref)) {
             $qresult=~s/\&$//;
-            if ($cipher) {
-                my $cmdlength=length($qresult);
-                $qresult.="         ";
-                my $encqresult='';
-                for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
-                    $encqresult.= unpack("H16",
-                                         $cipher->encrypt(substr($qresult,
-                                                                 $encidx,
-                                                                 8)));
-                }
-                &Reply( $client, "enc:$cmdlength:$encqresult\n", $userinput);
-            } else {
-                &Failure( $client, "error:no_key\n", $userinput);
-            }
+            &Reply($client, \$qresult, $userinput);
         } else {
             &Failure( $client, "error: ".($!+0)." untie(GDBM) Failed ".
-                      "while attempting egetdom\n",$userinput);
+                      "while attempting getdom\n",$userinput);
         }
     } else {
         &Failure($client, "error: ".($!+0)." tie(GDBM) Failed ".
-                 "while attempting egetdom\n",$userinput);
+                 "while attempting getdom\n",$userinput);
     }
+
     return 1;
 }
-&register_handler("egetdom", \&encrypted_get_domain_handler, 1, 1, 0);
+&register_handler("getdom", \&get_domain_handler, 0, 1, 0);
 
 #
 #  Puts an id to a domains id database.