aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-04 20:43:05 +0100
committerJustin Clark-Casey (justincc)2010-06-04 20:43:05 +0100
commit75878c8f43251477b3b10942b689d69c1e803056 (patch)
tree6baa8fa16d45e8c20768c4eff7dec3bb2c2cebd9 /OpenSim/Services
parentremove estate stuff in sqlite region migrations since this also exists in est... (diff)
downloadopensim-SC-75878c8f43251477b3b10942b689d69c1e803056.zip
opensim-SC-75878c8f43251477b3b10942b689d69c1e803056.tar.gz
opensim-SC-75878c8f43251477b3b10942b689d69c1e803056.tar.bz2
opensim-SC-75878c8f43251477b3b10942b689d69c1e803056.tar.xz
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
additional tweaks to get this working properly
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs2
-rw-r--r--OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs2
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs8
3 files changed, 10 insertions, 2 deletions
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
88 m_Database = LoadPlugin<IAuthenticationData>(dllName, 88 m_Database = LoadPlugin<IAuthenticationData>(dllName,
89 new Object[] {connString, realm}); 89 new Object[] {connString, realm});
90 if (m_Database == null) 90 if (m_Database == null)
91 throw new Exception("Could not find a storage interface in the given module"); 91 throw new Exception(string.Format("Could not find a storage interface in module {0}", dllName));
92 } 92 }
93 93
94 public bool Verify(UUID principalID, string token, int lifetime) 94 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
71 string hashed = Util.Md5Hash(password + ":" + 71 string hashed = Util.Md5Hash(password + ":" +
72 data.Data["passwordSalt"].ToString()); 72 data.Data["passwordSalt"].ToString());
73 73
74 //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString()); 74 m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
75 75
76 if (data.Data["passwordHash"].ToString() == hashed) 76 if (data.Data["passwordHash"].ToString() == hashed)
77 { 77 {
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
97 public UserAccount GetUserAccount(UUID scopeID, string firstName, 97 public UserAccount GetUserAccount(UUID scopeID, string firstName,
98 string lastName) 98 string lastName)
99 { 99 {
100// m_log.DebugFormat(
101// "[USER ACCOUNT SERVICE]: Retrieving account by username for {0} {1}, scope {2}",
102// firstName, lastName, scopeID);
103
100 UserAccountData[] d; 104 UserAccountData[] d;
101 105
102 if (scopeID != UUID.Zero) 106 if (scopeID != UUID.Zero)
@@ -231,6 +235,10 @@ namespace OpenSim.Services.UserAccountService
231 235
232 public bool StoreUserAccount(UserAccount data) 236 public bool StoreUserAccount(UserAccount data)
233 { 237 {
238// m_log.DebugFormat(
239// "[USER ACCOUNT SERVICE]: Storing user account for {0} {1} {2}, scope {3}",
240// data.FirstName, data.LastName, data.PrincipalID, data.ScopeID);
241
234 UserAccountData d = new UserAccountData(); 242 UserAccountData d = new UserAccountData();
235 243
236 d.FirstName = data.FirstName; 244 d.FirstName = data.FirstName;