From c9a24ece546fb20977d27abef736cd5e45d976e2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 4 Sep 2009 03:13:32 +0100
Subject: More work on new authentication service

---
 OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | 6 ++++--
 .../Services/AuthenticationService/PasswordAuthenticationService.cs | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services/AuthenticationService')

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
         {
             string dllName = String.Empty;
             string connString = String.Empty;
+            string realm = String.Empty;
 
             //
             // Try reading the [AuthenticationService] section first, if it exists
@@ -62,6 +63,7 @@ namespace OpenSim.Services.AuthenticationService
             {
                 dllName = authConfig.GetString("StorageProvider", dllName);
                 connString = authConfig.GetString("ConnectionString", connString);
+                realm = authConfig.GetString("Realm", realm);
             }
 
             //
@@ -79,11 +81,11 @@ namespace OpenSim.Services.AuthenticationService
             //
             // We tried, but this doesn't exist. We can't proceed.
             //
-            if (dllName.Equals(String.Empty))
+            if (dllName == String.Empty || realm == String.Empty)
                 throw new Exception("No StorageProvider configured");
 
             m_Database = LoadPlugin<IAuthenticationData>(dllName,
-                    new Object[] {connString});
+                    new Object[] {connString, realm});
             if (m_Database == null)
                 throw new Exception("Could not find a storage interface in the given module");
         }
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 @@
  */
 
 using System;
+using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Services.Interfaces;
 using log4net;
 using Nini.Config;
 using System.Reflection;
+using OpenSim.Data;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
 
 namespace OpenSim.Services.AuthenticationService
 {
-- 
cgit v1.1