ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

we don't use tab simbol, we use 4 whitespaces

Browse Source
This commit is contained in:
UbitUmarov
2018-07-08 13:26:41 +01:00
parent 6e3f934c4b
commit 60644b440b
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -88,7 +88,7 @@ namespace OpenSim.Services.LLLoginService
protected string m_AvatarPicker;
protected string m_AllowedClients;
protected string m_DeniedClients;
protected string m_DeniedMacs;
protected string m_DeniedMacs;
protected string m_MessageUrl;
protected string m_DSTZone;
protected bool m_allowDuplicatePresences = false;
@@ -135,7 +135,7 @@ namespace OpenSim.Services.LLLoginService
config, "AllowedClients", possibleAccessControlConfigSections, string.Empty);
m_DeniedClients = Util.GetConfigVarFromSections<string>(
config, "DeniedClients", possibleAccessControlConfigSections, string.Empty);
m_DeniedMacs = Util.GetConfigVarFromSections<string>(
m_DeniedMacs = Util.GetConfigVarFromSections<string>(
config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty);
m_MessageUrl = m_LoginServerConfig.GetString("MessageUrl", string.Empty);
@@ -293,8 +293,8 @@ namespace OpenSim.Services.LLLoginService
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} ",
firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
string curMac = mac.ToString();
string curMac = mac.ToString();
try
{
@@ -328,17 +328,17 @@ namespace OpenSim.Services.LLLoginService
return LLFailedLoginResponse.LoginBlockedProblem;
}
}
if (m_DeniedMacs != string.Empty)
{
m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
if (m_DeniedMacs.Contains(curMac))
{
m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client with mac {0} is denied", curMac);
return LLFailedLoginResponse.LoginBlockedProblem;
}
}
if (m_DeniedMacs != string.Empty)
{
m_log.InfoFormat("[LLOGIN SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
if (m_DeniedMacs.Contains(curMac))
{
m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: client with mac {0} is denied", curMac);
return LLFailedLoginResponse.LoginBlockedProblem;
}
}
//
// Get the account and check that it exists