--- loncom/lond	2004/04/13 09:41:57	1.178.2.15
+++ loncom/lond	2004/04/26 10:37:47	1.178.2.19
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.178.2.15 2004/04/13 09:41:57 foxr Exp $
+# $Id: lond,v 1.178.2.19 2004/04/26 10:37:47 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,7 +53,7 @@ my $DEBUG = 1;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.178.2.15 $'; #' stupid emacs
+my $VERSION='$Revision: 1.178.2.19 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
@@ -1138,10 +1138,7 @@ sub FetchUserFileHandler {
 }
 RegisterHandler("fetchuserfile", \&FetchUserFileHandler, 0, 1, 0);
 #
-#   Authenticate access to a user file.  Question?   The token for athentication
-#   is allowed to be sent as cleartext is this really what we want?  This token
-#   represents the user's session id.  Once it is forged does this allow too much 
-#   access??
+#   Authenticate access to a user file. 
 #
 # Parameters:
 #    $cmd      - The command that got us here.
@@ -1413,9 +1410,9 @@ sub RolesPutHandler {
     my $client     = shift;
     my $userinput  = "$cmd:$tail";
 
-    my ($exedom,$exeuser,$udom,$uname,$what)   =split(/:/,$tail);
-    &Debug("cmd = ".$cmd." exedom= ".$exedom."user = ".$exeuser." udom=".$udom.
-	   "what = ".$what);
+    my ( $exedom, $exeuser, $udom, $uname,  $what) = split(/:/,$tail);
+    
+
     my $namespace='roles';
     chomp($what);
     my $hashref = TieUserHash($udom, $uname, $namespace,
@@ -1617,7 +1614,7 @@ sub GetProfileEntryEncrypted {
     
     return 1;
 }
-RegisterHandler("eget", \&GetProfileEncrypted, 0, 1, 0);
+RegisterHandler("eget", \&GetProfileEntryEncrypted, 0, 1, 0);
 
 #
 #   Deletes a key in a user profile database.
@@ -1848,7 +1845,8 @@ sub DumpWithRegexp {
 }
 RegisterHandler("dump", \&DumpWithRegexp, 0, 1, 0);
 
-#  Store an aitem in any database but the roles database.
+#  Store an aitem in any resource meta data(?) or database with
+#  versioning?
 #
 #  Parameters:
 #    $cmd                - Request command keyword.
@@ -2223,19 +2221,24 @@ sub DumpCourseIdHandler {
     }
     unless (defined($since)) { $since=0; }
     my $qresult='';
-
+    logthis(" Looking for $description  since $since");
     my $hashref = TieDomainHash($udom, "nohist_courseids", &GDBM_WRCREAT());
     if ($hashref) {
 	while (my ($key,$value) = each(%$hashref)) {
 	    my ($descr,$lasttime)=split(/\:/,$value);
+	    logthis("Got:  key = $key descr = $descr time: $lasttime");
 	    if ($lasttime<$since) { 
+		logthis("Skipping .. too early");
 		next; 
 	    }
 	    if ($description eq '.') {
+		logthis("Adding wildcard match");
 		$qresult.=$key.'='.$descr.'&';
 	    } else {
 		my $unescapeVal = &unescape($descr);
+		logthis("Matching with $unescapeVal");
 		if (eval('$unescapeVal=~/$description/i')) {
+		    logthis("Adding on match");
 		    $qresult.="$key=$descr&";
 		}
 	    }
@@ -2493,10 +2496,15 @@ sub LsHandler {
 
     my $userinput = "$cmd:$ulsdir";
 
+    chomp($ulsdir);
+
     my $ulsout='';
     my $ulsfn;
+    logthis("ls for '$ulsdir'");
     if (-e $ulsdir) {
+	logthis("ls - directory exists");
 	if(-d $ulsdir) {
+	    logthis("ls  $ulsdir is a file");
 	    if (opendir(LSDIR,$ulsdir)) {
 		while ($ulsfn=readdir(LSDIR)) {
 		    my @ulsstats=stat($ulsdir.'/'.$ulsfn);
@@ -2680,6 +2688,8 @@ sub ProcessRequest {
     # Split off the request keyword from the rest of the stuff.
    
     my ($command, $tail) = split(/:/, $userinput, 2);
+    chomp($command);
+    chomp($tail);
 
     Debug("Command received: $command, encoded = $wasenc");
 
@@ -2721,7 +2731,7 @@ sub ProcessRequest {
 	    $KeepGoing = &$Handler($command, $tail, $client);
 	} else {
 	    Debug("Refusing to dispatch because ok is false");
-	    Failure($client, "refused", $userinput);
+	    Failure($client, "refused\n", $userinput);
 	}
 
 
@@ -4036,7 +4046,7 @@ sub ManagePermissions {
     my $authtype= shift;
 
     # See if the request is of the form /$domain/_au
-    &logthis("ruequest is $request");
+    &logthis("request is $request");
     if($request =~ /^(\/$domain\/_au)$/) { # It's an author rolesput...
 	my $execdir = $perlvar{'lonDaemons'};
 	my $userhome= "/home/$user" ;
@@ -4510,7 +4520,9 @@ sub make_passwd_file {
 	
 	my $useraddok = $?;
 	if($useraddok > 0) {
-	    &logthis("Failed lcuseradd: ".&lcuseraddstrerror($useraddok));
+	    my $lcstring = lcuseraddstrerror($useraddok);
+	    &logthis("Failed lcuseradd: $lcstring");
+	    return "error: lcuseradd failed: $lcstring\n";
 	}
 	my $pf = IO::File->new(">$passfilename");
 	print $pf "unix:\n";
@@ -4528,8 +4540,10 @@ sub make_passwd_file {
 
 sub sethost {
     my ($remotereq) = @_;
+    Debug("sethost got $remotereq");
     my (undef,$hostid)=split(/:/,$remotereq);
     if (!defined($hostid)) { $hostid=$perlvar{'lonHostID'}; }
+    Debug("sethost attempting to set host $hostid");
     if ($hostip{$perlvar{'lonHostID'}} eq $hostip{$hostid}) {
 	$currenthostid=$hostid;
 	$currentdomainid=$hostdom{$hostid};