diff options
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs index 57d0300..200268b 100644 --- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs +++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||
@@ -53,6 +53,7 @@ namespace OpenSim.Services.AuthenticationService | |||
53 | { | 53 | { |
54 | string dllName = String.Empty; | 54 | string dllName = String.Empty; |
55 | string connString = String.Empty; | 55 | string connString = String.Empty; |
56 | string realm = String.Empty; | ||
56 | 57 | ||
57 | // | 58 | // |
58 | // Try reading the [AuthenticationService] section first, if it exists | 59 | // Try reading the [AuthenticationService] section first, if it exists |
@@ -62,6 +63,7 @@ namespace OpenSim.Services.AuthenticationService | |||
62 | { | 63 | { |
63 | dllName = authConfig.GetString("StorageProvider", dllName); | 64 | dllName = authConfig.GetString("StorageProvider", dllName); |
64 | connString = authConfig.GetString("ConnectionString", connString); | 65 | connString = authConfig.GetString("ConnectionString", connString); |
66 | realm = authConfig.GetString("Realm", realm); | ||
65 | } | 67 | } |
66 | 68 | ||
67 | // | 69 | // |
@@ -79,11 +81,11 @@ namespace OpenSim.Services.AuthenticationService | |||
79 | // | 81 | // |
80 | // We tried, but this doesn't exist. We can't proceed. | 82 | // We tried, but this doesn't exist. We can't proceed. |
81 | // | 83 | // |
82 | if (dllName.Equals(String.Empty)) | 84 | if (dllName == String.Empty || realm == String.Empty) |
83 | throw new Exception("No StorageProvider configured"); | 85 | throw new Exception("No StorageProvider configured"); |
84 | 86 | ||
85 | m_Database = LoadPlugin<IAuthenticationData>(dllName, | 87 | m_Database = LoadPlugin<IAuthenticationData>(dllName, |
86 | new Object[] {connString}); | 88 | new Object[] {connString, realm}); |
87 | if (m_Database == null) | 89 | if (m_Database == null) |
88 | throw new Exception("Could not find a storage interface in the given module"); | 90 | throw new Exception("Could not find a storage interface in the given module"); |
89 | } | 91 | } |
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 5c83299..83ce0d0 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||
@@ -26,11 +26,15 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using OpenMetaverse; | 30 | using OpenMetaverse; |
30 | using OpenSim.Services.Interfaces; | 31 | using OpenSim.Services.Interfaces; |
31 | using log4net; | 32 | using log4net; |
32 | using Nini.Config; | 33 | using Nini.Config; |
33 | using System.Reflection; | 34 | using System.Reflection; |
35 | using OpenSim.Data; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Framework.Console; | ||
34 | 38 | ||
35 | namespace OpenSim.Services.AuthenticationService | 39 | namespace OpenSim.Services.AuthenticationService |
36 | { | 40 | { |