--- loncom/lond	2007/12/25 04:01:57	1.391
+++ loncom/lond	2008/05/30 21:34:27	1.394.2.1
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.391 2007/12/25 04:01:57 raeburn Exp $
+# $Id: lond,v 1.394.2.1 2008/05/30 21:34:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,7 +59,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.391 $'; #' stupid emacs
+my $VERSION='$Revision: 1.394.2.1 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -2141,17 +2141,17 @@ sub token_auth_user_file_handler {
     my ($fname, $session) = split(/:/, $tail);
     
     chomp($session);
-    my $reply="non_auth\n";
+    my $reply="non_auth";
     my $file = $perlvar{'lonIDsDir'}.'/'.$session.'.id';
     if (open(ENVIN,"$file")) {
 	flock(ENVIN,LOCK_SH);
 	tie(my %disk_env,'GDBM_File',"$file",&GDBM_READER(),0640);
 	if (exists($disk_env{"userfile.$fname"})) {
-	    $reply="ok\n";
+	    $reply="ok";
 	} else {
 	    foreach my $envname (keys(%disk_env)) {
 		if ($envname=~ m|^userfile\.\Q$fname\E|) {
-		    $reply="ok\n";
+		    $reply="ok";
 		    last;
 		}
 	    }
@@ -3518,7 +3518,9 @@ sub dump_course_id_handler {
                 $is_hash =  0;
                 my @courseitems = split(/:/,$value);
                 $lasttime = pop(@courseitems);
-                next if ($lasttime<$since);
+                if ($hashref->{$lasttime_key} eq '') {
+                    next if ($lasttime<$since);
+                }
 	        ($val{'descr'},$val{'inst_code'},$val{'owner'},$val{'type'}) = @courseitems;
             }
             my $match = 1;
@@ -4455,11 +4457,11 @@ sub validate_class_access_handler {
     my ($cmd, $tail, $client) = @_;
     my $userinput = "$cmd:$tail";
     my ($inst_class,$ownerlist,$cdom) = split(/:/, $tail);
-    my @owners = split(/,/,&unescape($ownerlist));
+    my $owners = &unescape($ownerlist);
     my $outcome;
     eval {
 	local($SIG{__DIE__})='DEFAULT';
-	$outcome=&localenroll::check_section($inst_class,\@owners,$cdom);
+	$outcome=&localenroll::check_section($inst_class,$owners,$cdom);
     };
     &Reply($client,\$outcome, $userinput);
 
@@ -6046,11 +6048,18 @@ sub validate_user {
 		my $credentials= &Authen::Krb5::cc_default();
 		$credentials->initialize(&Authen::Krb5::parse_name($user.'@'
                                                                  .$contentpwd));
-		my $krbreturn  = &Authen::Krb5::get_in_tkt_with_password($krbclient,
-									 $krbserver,
-									 $password,
-									 $credentials);
-		$validated = ($krbreturn == 1);
+                my $krbreturn;
+                if (exists(&Authen::Krb5::get_init_creds_password)) {
+                    $krbreturn = 
+                        &Authen::Krb5::get_init_creds_password($krbclient,$password,
+                                                               $krbservice);
+                    $validated = (ref($krbreturn) eq 'Authen::Krb5::Creds');
+                } else {
+		    $krbreturn  = 
+                        &Authen::Krb5::get_in_tkt_with_password($krbclient,$krbserver,
+		 						$password,$credentials);
+		    $validated = ($krbreturn == 1);
+                }
 		if (!$validated) {
 		    &logthis('krb5: '.$user.', '.$contentpwd.', '.
 			     &Authen::Krb5::error());