aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-26 02:44:46 +0000
committerJustin Clark-Casey (justincc)2011-03-26 02:44:46 +0000
commit797128a6ad89ea4944074f99db0a30ad7a5e7a3d (patch)
tree49ef8a70c5acb6333a832855eb6823d0894363f3
parentadd header file (diff)
downloadopensim-SC_OLD-797128a6ad89ea4944074f99db0a30ad7a5e7a3d.zip
opensim-SC_OLD-797128a6ad89ea4944074f99db0a30ad7a5e7a3d.tar.gz
opensim-SC_OLD-797128a6ad89ea4944074f99db0a30ad7a5e7a3d.tar.bz2
opensim-SC_OLD-797128a6ad89ea4944074f99db0a30ad7a5e7a3d.tar.xz
Rename some member fields to standard m_ OpenSim code convention
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index 00056a6..3590e12 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -43,16 +43,16 @@ namespace OpenSim.Services.AuthenticationService
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
46 private IConfigSource config; 46 private IConfigSource m_config;
47 private Dictionary<string, IAuthenticationService> svc_checks 47 private Dictionary<string, IAuthenticationService> m_svcChecks
48 = new Dictionary<string, IAuthenticationService>(); 48 = new Dictionary<string, IAuthenticationService>();
49 49
50 public WebkeyOrPasswordAuthenticationService(IConfigSource config) 50 public WebkeyOrPasswordAuthenticationService(IConfigSource config)
51 : base(config) 51 : base(config)
52 { 52 {
53 this.config = config; 53 this.m_config = config;
54 svc_checks["web_login_key"] = new WebkeyAuthenticationService(config); 54 m_svcChecks["web_login_key"] = new WebkeyAuthenticationService(config);
55 svc_checks["password"] = new PasswordAuthenticationService(config); 55 m_svcChecks["password"] = new PasswordAuthenticationService(config);
56 } 56 }
57 57
58 public string Authenticate(UUID principalID, string password, int lifetime) 58 public string Authenticate(UUID principalID, string password, int lifetime)
@@ -64,7 +64,7 @@ namespace OpenSim.Services.AuthenticationService
64 if (data.Data.ContainsKey("webLoginKey")) 64 if (data.Data.ContainsKey("webLoginKey"))
65 { 65 {
66 m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID); 66 m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID);
67 result = svc_checks["web_login_key"].Authenticate(principalID, password, lifetime); 67 result = m_svcChecks["web_login_key"].Authenticate(principalID, password, lifetime);
68 if (result == String.Empty) 68 if (result == String.Empty)
69 { 69 {
70 m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID); 70 m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID);
@@ -73,7 +73,7 @@ namespace OpenSim.Services.AuthenticationService
73 if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt")) 73 if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
74 { 74 {
75 m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID); 75 m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID);
76 result = svc_checks["password"].Authenticate(principalID, password, lifetime); 76 result = m_svcChecks["password"].Authenticate(principalID, password, lifetime);
77 if (result == String.Empty) 77 if (result == String.Empty)
78 { 78 {
79 m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID); 79 m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID);
@@ -91,4 +91,4 @@ namespace OpenSim.Services.AuthenticationService
91 return result; 91 return result;
92 } 92 }
93 } 93 }
94} 94} \ No newline at end of file