aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Authentication
diff options
context:
space:
mode:
authorMelanie2009-09-29 09:56:17 +0100
committerMelanie2009-09-29 09:56:17 +0100
commit691f1e8aa08db84b689793ea9cd2c72bcfdd9b17 (patch)
treebccc5f146d169c14615384d60d94f1ae3f79f354 /OpenSim/Server/Handlers/Authentication
parentFixed a bug that was causing exceptions to the thrown in ROBUST MainServer. (diff)
downloadopensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.zip
opensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.gz
opensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.bz2
opensim-SC_OLD-691f1e8aa08db84b689793ea9cd2c72bcfdd9b17.tar.xz
Fix loading modules with alternate configurations and ports into ROBUST.
Make all current modules support the configuration name option
Diffstat (limited to 'OpenSim/Server/Handlers/Authentication')
-rw-r--r--OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
index 589dc3b..2abef0a 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
@@ -37,13 +37,17 @@ namespace OpenSim.Server.Handlers.Authentication
37 public class AuthenticationServiceConnector : ServiceConnector 37 public class AuthenticationServiceConnector : ServiceConnector
38 { 38 {
39 private IAuthenticationService m_AuthenticationService; 39 private IAuthenticationService m_AuthenticationService;
40 private string m_ConfigName = "AuthenticationService";
40 41
41 public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) : 42 public AuthenticationServiceConnector(IConfigSource config, IHttpServer server, string configName) :
42 base(config, server) 43 base(config, server, configName)
43 { 44 {
44 IConfig serverConfig = config.Configs["AuthenticationService"]; 45 if (configName != String.Empty)
46 m_ConfigName = configName;
47
48 IConfig serverConfig = config.Configs[m_ConfigName];
45 if (serverConfig == null) 49 if (serverConfig == null)
46 throw new Exception("No section 'Server' in config file"); 50 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
47 51
48 string authenticationService = serverConfig.GetString("AuthenticationServiceModule", 52 string authenticationService = serverConfig.GetString("AuthenticationServiceModule",
49 String.Empty); 53 String.Empty);