aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/GatekeeperService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 019bab8..2dae6b7 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Services.HypergridService
62 62
63 private static string m_AllowedClients = string.Empty; 63 private static string m_AllowedClients = string.Empty;
64 private static string m_DeniedClients = string.Empty; 64 private static string m_DeniedClients = string.Empty;
65 private static string m_DeniedMacs = string.Empty; 65 private static string m_DeniedMacs = string.Empty;
66 private static bool m_ForeignAgentsAllowed = true; 66 private static bool m_ForeignAgentsAllowed = true;
67 private static List<string> m_ForeignsAllowedExceptions = new List<string>(); 67 private static List<string> m_ForeignsAllowedExceptions = new List<string>();
68 private static List<string> m_ForeignsDisallowedExceptions = new List<string>(); 68 private static List<string> m_ForeignsDisallowedExceptions = new List<string>();
@@ -138,7 +138,7 @@ namespace OpenSim.Services.HypergridService
138 config, "AllowedClients", possibleAccessControlConfigSections, string.Empty); 138 config, "AllowedClients", possibleAccessControlConfigSections, string.Empty);
139 m_DeniedClients = Util.GetConfigVarFromSections<string>( 139 m_DeniedClients = Util.GetConfigVarFromSections<string>(
140 config, "DeniedClients", possibleAccessControlConfigSections, string.Empty); 140 config, "DeniedClients", possibleAccessControlConfigSections, string.Empty);
141 m_DeniedMacs = Util.GetConfigVarFromSections<string>( 141 m_DeniedMacs = Util.GetConfigVarFromSections<string>(
142 config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty); 142 config, "DeniedMacs", possibleAccessControlConfigSections, string.Empty);
143 m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true); 143 m_ForeignAgentsAllowed = serverConfig.GetBoolean("ForeignAgentsAllowed", true);
144 144
@@ -278,8 +278,8 @@ namespace OpenSim.Services.HypergridService
278 (source == null) ? "Unknown" : string.Format("{0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI)); 278 (source == null) ? "Unknown" : string.Format("{0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI));
279 279
280 string curViewer = Util.GetViewerName(aCircuit); 280 string curViewer = Util.GetViewerName(aCircuit);
281 string curMac = aCircuit.Mac.ToString(); 281 string curMac = aCircuit.Mac.ToString();
282 282
283 283
284 // 284 //
285 // Check client 285 // Check client
@@ -309,17 +309,17 @@ namespace OpenSim.Services.HypergridService
309 return false; 309 return false;
310 } 310 }
311 } 311 }
312 312
313 if (m_DeniedMacs != string.Empty) 313 if (m_DeniedMacs != string.Empty)
314 { 314 {
315 m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); 315 m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs);
316 if (m_DeniedMacs.Contains(curMac)) 316 if (m_DeniedMacs.Contains(curMac))
317 { 317 {
318 reason = "Login failed: client with Mac " + curMac + " is denied"; 318 reason = "Login failed: client with Mac " + curMac + " is denied";
319 m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); 319 m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client with mac {0} is denied", curMac);
320 return false; 320 return false;
321 } 321 }
322 } 322 }
323 323
324 // 324 //
325 // Authenticate the user 325 // Authenticate the user