diff options
author | Justin Clark-Casey (justincc) | 2010-03-12 22:49:16 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-12 22:49:16 +0000 |
commit | 6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5 (patch) | |
tree | 92e96744a5513db89b74ff8cd6e8f443e0c874f7 /OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |
parent | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to Attachme... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.zip opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.tar.gz opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.tar.bz2 opensim-SC_OLD-6828d8ecbefb7f48c4ce93d497e16d3df25bc9a5.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 0876efb..6317b87 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -73,21 +73,24 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
73 | 73 | ||
74 | public void Initialise(IConfigSource source) | 74 | public void Initialise(IConfigSource source) |
75 | { | 75 | { |
76 | IConfig assetConfig = source.Configs["AuthenticationService"]; | 76 | if (Simian.IsSimianEnabled(source, "AuthenticationServices")) |
77 | if (assetConfig == null) | ||
78 | { | 77 | { |
79 | m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); | 78 | IConfig assetConfig = source.Configs["AuthenticationService"]; |
80 | throw new Exception("Authentication connector init error"); | 79 | if (assetConfig == null) |
81 | } | 80 | { |
81 | m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); | ||
82 | throw new Exception("Authentication connector init error"); | ||
83 | } | ||
82 | 84 | ||
83 | string serviceURI = assetConfig.GetString("AuthenticationServerURI"); | 85 | string serviceURI = assetConfig.GetString("AuthenticationServerURI"); |
84 | if (String.IsNullOrEmpty(serviceURI)) | 86 | if (String.IsNullOrEmpty(serviceURI)) |
85 | { | 87 | { |
86 | m_log.Info("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService, skipping SimianAuthenticationServiceConnector"); | 88 | m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); |
87 | return; | 89 | throw new Exception("Authentication connector init error"); |
88 | } | 90 | } |
89 | 91 | ||
90 | m_serverUrl = serviceURI; | 92 | m_serverUrl = serviceURI; |
93 | } | ||
91 | } | 94 | } |
92 | 95 | ||
93 | public string Authenticate(UUID principalID, string password, int lifetime) | 96 | public string Authenticate(UUID principalID, string password, int lifetime) |