aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-09-04 00:04:26 -0400
committerTeravus Ovares (Dan Olivares)2009-09-04 00:04:26 -0400
commit9f05edab04b7c592767b4875b00cec8468121744 (patch)
tree038c4955e4bbabd7ed2cd67443676480ca52f25a /OpenSim/Services
parent* Fixes the function 'GetTerrainHeightAtXY' (diff)
parentMore work on new authentication service (diff)
downloadopensim-SC_OLD-9f05edab04b7c592767b4875b00cec8468121744.zip
opensim-SC_OLD-9f05edab04b7c592767b4875b00cec8468121744.tar.gz
opensim-SC_OLD-9f05edab04b7c592767b4875b00cec8468121744.tar.bz2
opensim-SC_OLD-9f05edab04b7c592767b4875b00cec8468121744.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs6
-rw-r--r--OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs4
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
28using System; 28using System;
29using System.Collections.Generic;
29using OpenMetaverse; 30using OpenMetaverse;
30using OpenSim.Services.Interfaces; 31using OpenSim.Services.Interfaces;
31using log4net; 32using log4net;
32using Nini.Config; 33using Nini.Config;
33using System.Reflection; 34using System.Reflection;
35using OpenSim.Data;
36using OpenSim.Framework;
37using OpenSim.Framework.Console;
34 38
35namespace OpenSim.Services.AuthenticationService 39namespace OpenSim.Services.AuthenticationService
36{ 40{