aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
diff options
context:
space:
mode:
authorSignpostMarv Martin2011-03-24 16:46:21 +0000
committerJustin Clark-Casey (justincc)2011-03-26 02:28:11 +0000
commit3f4be42a87f77d5da7e6cafd4fb98ff6a502636d (patch)
treecdc0a16bea7300acf0e2790dabd4bfe6bb19c917 /OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
parentFixing bug that occurs when using web login- the result was not checked (diff)
downloadopensim-SC-3f4be42a87f77d5da7e6cafd4fb98ff6a502636d.zip
opensim-SC-3f4be42a87f77d5da7e6cafd4fb98ff6a502636d.tar.gz
opensim-SC-3f4be42a87f77d5da7e6cafd4fb98ff6a502636d.tar.bz2
opensim-SC-3f4be42a87f77d5da7e6cafd4fb98ff6a502636d.tar.xz
Altering log feedback
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index 3a47e97..c315ef2 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -32,25 +32,27 @@ namespace OpenSim.Services.AuthenticationService
32 { 32 {
33 if (data.Data.ContainsKey("webLoginKey")) 33 if (data.Data.ContainsKey("webLoginKey"))
34 { 34 {
35 m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID);
35 svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "WebkeyAuthenticationService", args); 36 svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "WebkeyAuthenticationService", args);
36 result = svc.Authenticate(principalID, password, lifetime); 37 result = svc.Authenticate(principalID, password, lifetime);
37 if (result == String.Empty) 38 if (result == String.Empty)
38 { 39 {
39 m_log.DebugFormat("[Authenticate]: Web Login failed for PrincipalID {0}", principalID); 40 m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID);
40 } 41 }
41 } 42 }
42 if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt")) 43 if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
43 { 44 {
45 m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID);
44 svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "PasswordAuthenticationService", args); 46 svc = ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Services.AuthenticationService.dll", "PasswordAuthenticationService", args);
45 result = svc.Authenticate(principalID, password, lifetime); 47 result = svc.Authenticate(principalID, password, lifetime);
46 if (result == String.Empty) 48 if (result == String.Empty)
47 { 49 {
48 m_log.DebugFormat("[Authenticate]: Password login failed for PrincipalID {0}", principalID); 50 m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID);
49 } 51 }
50 } 52 }
51 if (result == string.Empty) 53 if (result == string.Empty)
52 { 54 {
53 m_log.DebugFormat("[AUTH SERVICE]: Both password and webLoginKey-based login failed for PrincipalID {0}", principalID); 55 m_log.DebugFormat("[AUTH SERVICE]: Both password and webLoginKey-based authentication failed for PrincipalID {0}", principalID);
54 } 56 }
55 } 57 }
56 else 58 else