diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index e2cb5d0..a57c9a7 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Services.LLLoginService | |||
88 | protected string m_AvatarPicker; | 88 | protected string m_AvatarPicker; |
89 | protected string m_AllowedClients; | 89 | protected string m_AllowedClients; |
90 | protected string m_DeniedClients; | 90 | protected string m_DeniedClients; |
91 | protected string m_DeniedMacs; | 91 | protected string m_DeniedMacs; |
92 | protected string m_MessageUrl; | 92 | protected string m_MessageUrl; |
93 | protected string m_DSTZone; | 93 | protected string m_DSTZone; |
94 | protected bool m_allowDuplicatePresences = false; | 94 | protected bool m_allowDuplicatePresences = false; |
@@ -135,7 +135,7 @@ namespace OpenSim.Services.LLLoginService | |||
135 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); | 135 | config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); |
136 | m_DeniedClients = Util.GetConfigVarFromSections<string>( | 136 | m_DeniedClients = Util.GetConfigVarFromSections<string>( |
137 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); | 137 | config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); |
138 | m_DeniedMacs = Util.GetConfigVarFromSections<string>( | 138 | m_DeniedMacs = Util.GetConfigVarFromSections<string>( |
139 | config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); | 139 | config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); |
140 | 140 | ||
141 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); | 141 | m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty); |
@@ -293,8 +293,8 @@ namespace OpenSim.Services.LLLoginService | |||
293 | 293 | ||
294 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", | 294 | m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", |
295 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); | 295 | firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); |
296 | 296 | ||
297 | string curMac = mac.ToString(); | 297 | string curMac = mac.ToString(); |
298 | 298 | ||
299 | try | 299 | try |
300 | { | 300 | { |
@@ -328,17 +328,17 @@ namespace OpenSim.Services.LLLoginService | |||
328 | return LLFailedLoginResponse.LoginBlockedProblem; | 328 | return LLFailedLoginResponse.LoginBlockedProblem; |
329 | } | 329 | } |
330 | } | 330 | } |
331 | 331 | ||
332 | if (m_DeniedMacs != string.Empty) | 332 | if (m_DeniedMacs != string.Empty) |
333 | { | 333 | { |
334 | m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); | 334 | m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); |
335 | if (m_DeniedMacs.Contains(curMac)) | 335 | if (m_DeniedMacs.Contains(curMac)) |
336 | { | 336 | { |
337 | m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); | 337 | m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); |
338 | return LLFailedLoginResponse.LoginBlockedProblem; | 338 | return LLFailedLoginResponse.LoginBlockedProblem; |
339 | } | 339 | } |
340 | } | 340 | } |
341 | 341 | ||
342 | 342 | ||
343 | // | 343 | // |
344 | // Get the account and check that it exists | 344 | // Get the account and check that it exists |