aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ServiceAuth/ServiceAuth.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-03-16 23:40:34 +0000
committerJustin Clark-Casey (justincc)2015-03-16 23:40:34 +0000
commiteda09d87635683d92d1661f6bbedf678c879c08f (patch)
treec83df2e80607735bfe6641864e936902c697d7c2 /OpenSim/Framework/ServiceAuth/ServiceAuth.cs
parentUpdate version info to 0.8.2.0 (diff)
downloadopensim-SC_OLD-eda09d87635683d92d1661f6bbedf678c879c08f.zip
opensim-SC_OLD-eda09d87635683d92d1661f6bbedf678c879c08f.tar.gz
opensim-SC_OLD-eda09d87635683d92d1661f6bbedf678c879c08f.tar.bz2
opensim-SC_OLD-eda09d87635683d92d1661f6bbedf678c879c08f.tar.xz
Fix XBakes simulator-side authentication regression failure
Unlike the other connectors, XBakes uses a service auth retrieved from ServiceAuth.Create() and not code inherited from BaseServiceConnector. Fixes regression from 7d3bafd5 (Wed 4 Mar 2015) where the new CompoundAuthenticator did not implement IServiceAuth.AddAuthorization()
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ServiceAuth/ServiceAuth.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/ServiceAuth/ServiceAuth.cs b/OpenSim/Framework/ServiceAuth/ServiceAuth.cs
index 30f5bd6..51012e3 100644
--- a/OpenSim/Framework/ServiceAuth/ServiceAuth.cs
+++ b/OpenSim/Framework/ServiceAuth/ServiceAuth.cs
@@ -27,13 +27,16 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30 30using System.Reflection;
31using log4net;
31using Nini.Config; 32using Nini.Config;
32 33
33namespace OpenSim.Framework.ServiceAuth 34namespace OpenSim.Framework.ServiceAuth
34{ 35{
35 public class ServiceAuth 36 public class ServiceAuth
36 { 37 {
38// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39
37 public static IServiceAuth Create(IConfigSource config, string section) 40 public static IServiceAuth Create(IConfigSource config, string section)
38 { 41 {
39 CompoundAuthentication compoundAuth = new CompoundAuthentication(); 42 CompoundAuthentication compoundAuth = new CompoundAuthentication();
@@ -53,6 +56,9 @@ namespace OpenSim.Framework.ServiceAuth
53 break; 56 break;
54 } 57 }
55 58
59// foreach (IServiceAuth auth in compoundAuth.GetAuthentors())
60// m_log.DebugFormat("[SERVICE AUTH]: Configured authenticator {0}", auth.Name);
61
56 if (compoundAuth.Count > 0) 62 if (compoundAuth.Count > 0)
57 return compoundAuth; 63 return compoundAuth;
58 else 64 else