From 75878c8f43251477b3b10942b689d69c1e803056 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Jun 2010 20:43:05 +0100
Subject: get TestSaveIarV0_1() working again by setting up an
 OpenSim.Data.Null.UserAuthenticationData plugin

additional tweaks to get this working properly
---
 .../Services/AuthenticationService/AuthenticationServiceBase.cs   | 2 +-
 .../AuthenticationService/PasswordAuthenticationService.cs        | 2 +-
 OpenSim/Services/UserAccountService/UserAccountService.cs         | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index 9af61a9..edc1097 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.AuthenticationService
             m_Database = LoadPlugin<IAuthenticationData>(dllName,
                     new Object[] {connString, realm});
             if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module");
+                throw new Exception(string.Format("Could not find a storage interface in module {0}", dllName));
         }
 
         public bool Verify(UUID principalID, string token, int lifetime)
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 2fc9248..17619ff 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Services.AuthenticationService
                 string hashed = Util.Md5Hash(password + ":" +
                         data.Data["passwordSalt"].ToString());
 
-                //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
+                m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
 
                 if (data.Data["passwordHash"].ToString() == hashed)
                 {
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index eb588f0..063251a 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -97,6 +97,10 @@ namespace OpenSim.Services.UserAccountService
         public UserAccount GetUserAccount(UUID scopeID, string firstName,
                 string lastName)
         {
+//			m_log.DebugFormat(
+//			    "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}", 
+//			    firstName, lastName, scopeID);
+			
             UserAccountData[] d;
 
             if (scopeID != UUID.Zero)
@@ -231,6 +235,10 @@ namespace OpenSim.Services.UserAccountService
 
         public bool StoreUserAccount(UserAccount data)
         {
+//			m_log.DebugFormat(
+//			    "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}", 
+//			    data.FirstName, data.LastName, data.PrincipalID, data.ScopeID);
+			
             UserAccountData d = new UserAccountData();
 
             d.FirstName = data.FirstName;
-- 
cgit v1.1