OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename some member fields to standard m_ OpenSim code convention

0.7.1-dev
Justin Clark-Casey (justincc) 2011-03-26 02:44:46 +00:00
parent 83f48c26d6
commit 797128a6ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
View File

@ -43,16 +43,16 @@ namespace OpenSim.Services.AuthenticationService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IConfigSource config; private IConfigSource m_config;
private Dictionary<string, IAuthenticationService> svc_checks private Dictionary<string, IAuthenticationService> m_svcChecks
= new Dictionary<string, IAuthenticationService>(); = new Dictionary<string, IAuthenticationService>();
public WebkeyOrPasswordAuthenticationService(IConfigSource config) public WebkeyOrPasswordAuthenticationService(IConfigSource config)
: base(config) : base(config)
{ {
this.config = config; this.m_config = config;
svc_checks["web_login_key"] = new WebkeyAuthenticationService(config); m_svcChecks["web_login_key"] = new WebkeyAuthenticationService(config);
svc_checks["password"] = new PasswordAuthenticationService(config); m_svcChecks["password"] = new PasswordAuthenticationService(config);
} }
public string Authenticate(UUID principalID, string password, int lifetime) public string Authenticate(UUID principalID, string password, int lifetime)
@ -64,7 +64,7 @@ namespace OpenSim.Services.AuthenticationService
if (data.Data.ContainsKey("webLoginKey")) if (data.Data.ContainsKey("webLoginKey"))
{ {
m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID); m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID);
result = svc_checks["web_login_key"].Authenticate(principalID, password, lifetime); result = m_svcChecks["web_login_key"].Authenticate(principalID, password, lifetime);
if (result == String.Empty) if (result == String.Empty)
{ {
m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID); m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID);
@ -73,7 +73,7 @@ namespace OpenSim.Services.AuthenticationService
if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt")) if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
{ {
m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID); m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID);
result = svc_checks["password"].Authenticate(principalID, password, lifetime); result = m_svcChecks["password"].Authenticate(principalID, password, lifetime);
if (result == String.Empty) if (result == String.Empty)
{ {
m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID); m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID);
@ -91,4 +91,4 @@ namespace OpenSim.Services.AuthenticationService
return result; return result;
} }
} }
} }