From e93531e1240348f18abb4ef88a0def227026e8f3 Mon Sep 17 00:00:00 2001
From: SignpostMarv Martin
Date: Thu, 24 Mar 2011 16:21:12 +0000
Subject: Fixing bug that occurs when using web login- the result was not
 checked

---
 .../AuthenticationService/WebkeyOrPasswordAuthenticationService.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs')

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
                         m_log.DebugFormat("[Authenticate]: Web Login failed for PrincipalID {0}", principalID);
                     }
                 }
-                if (data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
+                if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
                 {
                     svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "PasswordAuthenticationService", args);
                     result = svc.Authenticate(principalID, password, lifetime);
-- 
cgit v1.1