aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSignpostMarv Martin2011-03-24 16:21:12 +0000
committerJustin Clark-Casey (justincc)2011-03-26 02:28:11 +0000
commite93531e1240348f18abb4ef88a0def227026e8f3 (patch)
treee20762945035fac6736f4d58734e6796c34eb97f /OpenSim
parentMaking combined auth service re-use the existing auth services instead of dup... (diff)
downloadopensim-SC-e93531e1240348f18abb4ef88a0def227026e8f3.zip
opensim-SC-e93531e1240348f18abb4ef88a0def227026e8f3.tar.gz
opensim-SC-e93531e1240348f18abb4ef88a0def227026e8f3.tar.bz2
opensim-SC-e93531e1240348f18abb4ef88a0def227026e8f3.tar.xz
Fixing bug that occurs when using web login- the result was not checked
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index b8bb090..3a47e97 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Services.AuthenticationService
39 m_log.DebugFormat("[Authenticate]: Web Login failed for PrincipalID {0}", principalID); 39 m_log.DebugFormat("[Authenticate]: Web Login failed for PrincipalID {0}", principalID);
40 } 40 }
41 } 41 }
42 if (data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt")) 42 if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
43 { 43 {
44 svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "PasswordAuthenticationService", args); 44 svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "PasswordAuthenticationService", args);
45 result = svc.Authenticate(principalID, password, lifetime); 45 result = svc.Authenticate(principalID, password, lifetime);