--- loncom/lond	2006/11/27 22:51:14	1.351
+++ loncom/lond	2007/01/08 16:23:48	1.353
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.351 2006/11/27 22:51:14 banghart Exp $
+# $Id: lond,v 1.353 2007/01/08 16:23:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.351 $'; #' stupid emacs
+my $VERSION='$Revision: 1.353 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3054,8 +3054,8 @@ sub restore_handler {
 
     my $userinput = "$cmd:$tail";	# Only used for logging purposes.
     my ($udom,$uname,$namespace,$rid) = split(/:/,$tail);
-    $namespace = &LONCAPA::clean_username($namespace);
     $namespace=~s/\//\_/g;
+    $namespace = &LONCAPA::clean_username($namespace);
 
     chomp($rid);
     my $qresult='';
@@ -5893,7 +5893,8 @@ sub validate_user {
 	    #  Authenticate via installation specific authentcation method:
 	    $validated = &localauth::localauth($user, 
 					       $password, 
-					       $contentpwd);
+					       $contentpwd,
+					       $domain);
 	} else {			# Unrecognized auth is also bad.
 	    $validated = 0;
 	}