From 8fdf70b87e51bdd2035f5ab54a335fbb50d79e80 Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Wed, 16 Oct 2013 20:15:04 -0500
Subject: * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes -
 Mono.Security.dll missing.    The root of the issue is that the Postgres
 driver relies on Mono.Security.dll from the mono project.   Unfortunately,
 when using Mono, including the dll in the distribution causes conflicts. 
 This solution puts Mono.Security.dll in bin/lib/NET/  and, if windows .NET is
 the runtime, informs the assembly loader to load
 bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security
 namespace.   On Mono, the included Mono.Security assembly is ignored.

---
 OpenSim/Data/PGSQL/PGSQLFramework.cs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'OpenSim/Data/PGSQL/PGSQLFramework.cs')

diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
index 494b0aa..48f8dd3 100644
--- a/OpenSim/Data/PGSQL/PGSQLFramework.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Data;
+using System.Reflection;
 using OpenMetaverse;
 using OpenSim.Framework;
 using Npgsql;
@@ -50,8 +51,30 @@ namespace OpenSim.Data.PGSQL
         protected PGSqlFramework(string connectionString)
         {
             m_connectionString = connectionString;
+            InitializeMonoSecurity();
         }
 
+        public void InitializeMonoSecurity()
+        {
+            if (!Util.IsPlatformMono)
+            {
+                AppDomain currentDomain = AppDomain.CurrentDomain;
+                currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+            }
+        }
+
+        private System.Reflection.Assembly ResolveEventHandlerMonoSec(object sender, ResolveEventArgs args)
+        {
+            Assembly MyAssembly = null;
+
+            if (args.Name.Substring(0, args.Name.IndexOf(",")) == "Mono.Security")
+            {
+                MyAssembly = Assembly.LoadFrom("lib/NET/Mono.Security.dll");
+            }
+
+            //Return the loaded assembly.
+            return MyAssembly;
+        }
         //////////////////////////////////////////////////////////////
         //
         // All non queries are funneled through one connection
-- 
cgit v1.1


From f83343d3022d568f4fdbbfa79fee867ba4d2e9ec Mon Sep 17 00:00:00 2001
From: Fernando Oliveira
Date: Wed, 16 Oct 2013 21:20:11 -0500
Subject: * One More thing, add an appdomain data element to ensure that we
 don't duplicate the assembly resolving.

---
 OpenSim/Data/PGSQL/PGSQLFramework.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/PGSQL/PGSQLFramework.cs')

diff --git a/OpenSim/Data/PGSQL/PGSQLFramework.cs b/OpenSim/Data/PGSQL/PGSQLFramework.cs
index 48f8dd3..1028e4e 100644
--- a/OpenSim/Data/PGSQL/PGSQLFramework.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFramework.cs
@@ -58,8 +58,14 @@ namespace OpenSim.Data.PGSQL
         {
             if (!Util.IsPlatformMono)
             {
-                AppDomain currentDomain = AppDomain.CurrentDomain;
-                currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+
+                if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
+                {
+                    AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
+
+                    AppDomain currentDomain = AppDomain.CurrentDomain;
+                    currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
+                }
             }
         }
 
-- 
cgit v1.1