--- loncom/lond	2004/06/17 11:02:25	1.196
+++ loncom/lond	2004/06/21 13:25:53	1.200
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.196 2004/06/17 11:02:25 foxr Exp $
+# $Id: lond,v 1.200 2004/06/21 13:25:53 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,7 +56,7 @@ my $DEBUG = 11;		       # Non zero to en
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.196 $'; #' stupid emacs
+my $VERSION='$Revision: 1.200 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -69,6 +69,8 @@ my $clientname;			# LonCAPA name of clie
 my $server;
 my $thisserver;			# DNS of us.
 
+my $keymode;
+
 # 
 #   Connection type is:
 #      client                   - All client actions are allowed
@@ -1218,13 +1220,13 @@ sub logstatus {
     {
     my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
     print $fh $$."\t".$clientname."\t".$currenthostid."\t"
-	.$status."\t".$lastlog."\n";
+	.$status."\t".$lastlog."\t $keymode\n";
     $fh->close();
     }
     &status("Finished londstatus.txt");
     {
 	my $fh=IO::File->new(">$docdir/lon-status/londchld/$$.txt");
-        print $fh $status."\n".$lastlog."\n".time;
+        print $fh $status."\n".$lastlog."\n".time."\n$keymode";
         $fh->close();
     }
     &status("Finished logging");
@@ -1556,6 +1558,7 @@ sub make_new_child {
 			print $client "ok:local\n";
 			&logthis('<font color="green"'
 				 . "Successful local authentication </font>");
+			$keymode = "local"
 		    } else {
 			Debug("Failed to get local key");
 			$clientok = 0;
@@ -1570,6 +1573,7 @@ sub make_new_child {
 			$cipher       = new IDEA($cipherkey);
 			&logthis('<font color="green">'
 				 ."Successfull ssl authentication with $clientname </font>");
+			$keymode = "ssl";
 	     
 		    } else {
 			$clientok = 0;
@@ -1583,6 +1587,7 @@ sub make_new_child {
 			&logthis('<font color="green">'
 				 ."Successful insecure authentication with $clientname </font>");
 			print $client "ok\n";
+			$keymode = "insecure";
 		    } else {
 			&logthis('<font color="yellow">'
 				  ."Attempted insecure connection disallowed </font>");
@@ -3115,53 +3120,54 @@ sub make_new_child {
 			print $client "refused\n";
 		    }
 #------------------------------- is auto-enrollment enabled?
-                } elsif ($userinput =~/^autorun/) {
+                } elsif ($userinput =~/^autorun:/) {
                     if (isClient) {
-                        my $outcome = &localenroll::run();
+                        my ($cmd,$cdom) = split(/:/,$userinput);
+                        my $outcome = &localenroll::run($cdom);
                         print $client "$outcome\n";
                     } else {
                         print $client "0\n";
                     }
 #------------------------------- get official sections (for auto-enrollment).
-                } elsif ($userinput =~/^autogetsections/) {
+                } elsif ($userinput =~/^autogetsections:/) {
                     if (isClient) {
-                        my ($cmd,$coursecode)=split(/:/,$userinput);
-                        my @secs = &localenroll::get_sections($coursecode);
+                        my ($cmd,$coursecode,$cdom)=split(/:/,$userinput);
+                        my @secs = &localenroll::get_sections($coursecode,$cdom);
                         my $seclist = &escape(join(':',@secs));
                         print $client "$seclist\n";
                     } else {
                         print $client "refused\n";
                     }
 #----------------------- validate owner of new course section (for auto-enrollment).
-                } elsif ($userinput =~/^autonewcourse/) {
+                } elsif ($userinput =~/^autonewcourse:/) {
                     if (isClient) {
-                        my ($cmd,$course_id,$owner)=split(/:/,$userinput);
-                        my $outcome = &localenroll::new_course($course_id,$owner);
+                        my ($cmd,$inst_course_id,$owner,$cdom)=split(/:/,$userinput);
+                        my $outcome = &localenroll::new_course($inst_course_id,$owner,$cdom);
                         print $client "$outcome\n";
                     } else {
                         print $client "refused\n";
                     }
 #-------------- validate course section in schedule of classes (for auto-enrollment).
-                } elsif ($userinput =~/^autovalidatecourse/) {
+                } elsif ($userinput =~/^autovalidatecourse:/) {
                     if (isClient) {
-                        my ($cmd,$course_id)=split(/:/,$userinput);
-                        my $outcome=&localenroll::validate_courseID($course_id);
+                        my ($cmd,$inst_course_id,$cdom)=split(/:/,$userinput);
+                        my $outcome=&localenroll::validate_courseID($inst_course_id,$cdom);
                         print $client "$outcome\n";
                     } else {
                         print $client "refused\n";
                     }
 #--------------------------- create password for new user (for auto-enrollment).
-                } elsif ($userinput =~/^autocreatepassword/) {
+                } elsif ($userinput =~/^autocreatepassword:/) {
                     if (isClient) {
-                        my ($cmd,$authparam)=split(/:/,$userinput);
-                        my ($create_passwd,$authchk) = @_;
-                        ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam);
+                        my ($cmd,$authparam,$cdom)=split(/:/,$userinput);
+                        my ($create_passwd,$authchk);
+                        ($authparam,$create_passwd,$authchk) = &localenroll::create_password($authparam,$cdom);
                         print $client &escape($authparam.':'.$create_passwd.':'.$authchk)."\n";
                     } else {
                         print $client "refused\n";
                     }
 #---------------------------  read and remove temporary files (for auto-enrollment).
-                } elsif ($userinput =~/^autoretrieve/) {
+                } elsif ($userinput =~/^autoretrieve:/) {
                     if (isClient) {
                         my ($cmd,$filename) = split(/:/,$userinput);
                         my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
@@ -3194,7 +3200,7 @@ sub make_new_child {
 		}
 # -------------------------------------------------------------------- complete
 		alarm(0);
-		&status('Listening to '.$clientname);
+		&status('Listening to '.$clientname." ($keymode)");
 	    }
 # --------------------------------------------- client unknown or fishy, refuse
 	} else {