[LON-CAPA-cvs] cvs: loncom / lond

foxr lon-capa-cvs@mail.lon-capa.org
Mon, 17 Nov 2003 09:32:17 -0000


foxr		Mon Nov 17 04:32:17 2003 EDT

  Modified files:              
    /loncom	lond 
  Log:
  Simplify authentication since for now it's done at connection time via hosts.tab
  and managers.tab
  
  
Index: loncom/lond
diff -u loncom/lond:1.162 loncom/lond:1.163
--- loncom/lond:1.162	Wed Nov 12 15:47:04 2003
+++ loncom/lond	Mon Nov 17 04:32:17 2003
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.162 2003/11/12 20:47:04 matthew Exp $
+# $Id: lond,v 1.163 2003/11/17 09:32:17 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,7 +52,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.162 $'; #' stupid emacs
+my $VERSION='$Revision: 1.163 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -205,26 +205,7 @@
 sub ValidManager {
     my $certificate = shift; 
 
-    ReadManagerTable;
-
-    my $hostname   = $hostid{$certificate};
-
-
-    if ($hostname ne undef) {
-	if($managers{$hostname} ne undef) {
-	    &logthis('<font color="yellow">Authenticating manager'.
-		     " $hostname</font>");
-	    return 1;
-	} else {
-	    &logthis('<font color="red" failed manager authentication '.
-		     $hostname." is not a valid manager host</font>");
-	    return 0;
-	}
-    } else {
-	&logthis('<font color="red"> Failed manager authentication '.
-		 "$certificate </font>");
-	return 0;
-    }
+    return isManager;
 }
 #
 #  CopyFile:  Called as part of the process of installing a