diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2005-12-20 08:15:53 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2005-12-20 08:15:53 +0300 |
| commit | d856fd3310da4a6115dd0f50a23641ec9d102863 (patch) | |
| tree | d2f8b0a6bf9a78bb959af1f80a1cb3de4e197209 /mcs/class/Novell.Directory.Ldap | |
| parent | 461442c87c75f8df1a4255396c135da5d7fd299a (diff) | |
Fix LDAP with https support patch from Loren Bandiera
svn path=/trunk/mcs/; revision=54643
Diffstat (limited to 'mcs/class/Novell.Directory.Ldap')
| -rw-r--r-- | mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs | 3 | ||||
| -rw-r--r-- | mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs index fdc4153377e..08d41c4e829 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.Utilclass/ResourcesHandler.cs @@ -181,7 +181,8 @@ namespace Novell.Directory.Ldap.Utilclass { /* defaultResultCodes = ResourceManager.CreateFileBasedResourceManager("ResultCodeMessages", "Resources", null);*/ - defaultResultCodes = new ResourceManager("Novell.Directory.Ldap.Utilclass.ResultCodeMessages", Assembly.GetExecutingAssembly()); + defaultResultCodes = new ResourceManager("ResultCodeMessages", Assembly.GetExecutingAssembly()); + } if (defaultLocale == null) diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs index 78788c8b588..7390259824b 100644 --- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs +++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs @@ -748,7 +748,7 @@ namespace Novell.Directory.Ldap Assembly a; try { - a = Assembly.LoadFrom("Mono.Security.dll"); + a = Assembly.LoadWithPartialName("Mono.Security"); } catch(System.IO.FileNotFoundException) { |