diff options
author | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
commit | 9b95bd259fa15157947326f044f63aedc248e73c (patch) | |
tree | b89733673d71a41529b40ea55f2e66d712991ecb /OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |
parent | minor: remove mono compiler warning (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.zip opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.gz opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.bz2 opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 9c4718e..f1c2575 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs | |||
@@ -73,24 +73,20 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
73 | 73 | ||
74 | public void Initialise(IConfigSource source) | 74 | public void Initialise(IConfigSource source) |
75 | { | 75 | { |
76 | if (Simian.IsSimianEnabled(source, "AuthenticationServices", this.Name)) | 76 | IConfig gridConfig = source.Configs["AuthenticationService"]; |
77 | if (gridConfig != null) | ||
77 | { | 78 | { |
78 | IConfig assetConfig = source.Configs["AuthenticationService"]; | 79 | string serviceUrl = gridConfig.GetString("AuthenticationServerURI"); |
79 | if (assetConfig == null) | 80 | if (!String.IsNullOrEmpty(serviceUrl)) |
80 | { | 81 | { |
81 | m_log.Error("[SIMIAN AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); | 82 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
82 | throw new Exception("Authentication connector init error"); | 83 | serviceUrl = serviceUrl + '/'; |
84 | m_serverUrl = serviceUrl; | ||
83 | } | 85 | } |
84 | |||
85 | string serviceURI = assetConfig.GetString("AuthenticationServerURI"); | ||
86 | if (String.IsNullOrEmpty(serviceURI)) | ||
87 | { | ||
88 | m_log.Error("[SIMIAN AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); | ||
89 | throw new Exception("Authentication connector init error"); | ||
90 | } | ||
91 | |||
92 | m_serverUrl = serviceURI; | ||
93 | } | 86 | } |
87 | |||
88 | if (String.IsNullOrEmpty(m_serverUrl)) | ||
89 | m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector"); | ||
94 | } | 90 | } |
95 | 91 | ||
96 | public string Authenticate(UUID principalID, string password, int lifetime) | 92 | public string Authenticate(UUID principalID, string password, int lifetime) |