Added support for secure authentication by underlined provider.

svn path=/trunk/mcs/; revision=47902

diff --git a/mcs/class/System.DirectoryServices/App.config b/mcs/class/System.DirectoryServices/App.config
index a8becc4e0f8f79eafd85c1ce98c40eb77484fb21..5506bd33ba441213b402aa07ad08c53011f17f29 100644 (file)
--- a/mcs/class/System.DirectoryServices/App.config
+++ b/mcs/class/System.DirectoryServices/App.config
@@ -11,6 +11,8 @@
       <Settings>\r
           <add key="servername" value="xp050"/>\r
           <add key="port" value="389"/>\r
+          <add key="securitymech" value="1.2.840.113554.1.2.2"/>\r
+          <add key="securityappname" value="com.mainsoft.system.directoryservices"/>\r
       </Settings>\r
   </System.DirectoryServices>\r
 </configuration>\r

diff --git a/mcs/class/System.DirectoryServices/ChangeLog b/mcs/class/System.DirectoryServices/ChangeLog
index 47d1e5022c66eeb47800daa28669135341935b56..5f4609a13caf4dd4ad346cd048ba32af43d0ba63 100644 (file)
--- a/mcs/class/System.DirectoryServices/ChangeLog
+++ b/mcs/class/System.DirectoryServices/ChangeLog
@@ -1,3 +1,7 @@
+2005-28-07  Boris Kirzner <borisk@mainsoft.com>
+       * System.DirectoryServices.vmwcsproj: updated TARGET_JVM project file.
+       * App.config: added addition supported key examples.
+
 2005-05-07  Boris Kirzner <borisk@mainsoft.com>        
        * System.DirectoryServices.vmwcsproj: Project file converted 
        to Developer Edition format. Removed ClearCase references.

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj b/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj
index 0dd75de2349285841f145c7b4b45557041433b28..003fbbdf1ea8209c2002cfed44c7acfea3f9a852 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj
@@ -8,8 +8,6 @@
                        </Settings>\r
                        <References>\r
                                <Reference Name="System" AssemblyName="System" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>\r
-                               <Reference Name="System.Data" AssemblyName="System.Data" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>\r
-                               <Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>\r
                                <Reference Name="Novell.Directory.Ldap" Project="{0B45F886-E6BB-4871-B9C1-77A0D92DA76E}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
                        </References>\r
                </Build>\r
@@ -46,6 +44,6 @@
                                <File RelPath="System.DirectoryServices.Design\DirectoryEntryConverter.cs" SubType="Code" BuildAction="Compile"/>\r
                        </Include>\r
                </Files>\r
-               <UserProperties project.JDKType="1.4.2_05" REFS.JarPath.system.xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar"/>\r
+               <UserProperties project.JDKType="1.4.2_05" REFS.JarPath.system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar"/>\r
        </CSHARP>\r
        <VisualMainWin><Project Prop2023="1.4.2_05" Prop2024="" Prop2026="" Prop2015="" Version="1.6.0" ProjectType="1"/><References/><Configs><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="-1" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="-1" Name="Debug_Java"/></Configs></VisualMainWin></VisualStudioProject>\r

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/ChangeLog b/mcs/class/System.DirectoryServices/System.DirectoryServices/ChangeLog
index cca9ba7ba9e1429bb5b2b8089010b822cf8bed86..1d2aeae82fe82bf9837ce82b762999043b2658e5 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/ChangeLog
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/ChangeLog
@@ -1,3 +1,7 @@
+2005-28-07  Boris Kirzner <borisk@mainsoft.com>
+       * DirectoryEntry.cs: pass AuthenticationType as a parameter for
+       LdapConnection.Bind.
+
 2005-06-19 Boris Kirzner <borisk@mainsoft.coim>
        * DirectorySearcher.cs: 
                - Use ADsPath property (always represents an actual url) 

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntry.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntry.cs
index e034e3d58a64b995cf98e1047fe4514a2f7929c9..d74a29536566fd83e196c3d5572ce69316a09823 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntry.cs
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntry.cs
@@ -126,7 +126,7 @@ namespace System.DirectoryServices
                                _conn= new LdapConnection ();
                                LdapUrl lUrl = new LdapUrl (ADsPath);
                                _conn.Connect(lUrl.Host,lUrl.Port);
-                               _conn.Bind(Username,Password);
+                               _conn.Bind(Username,Password, (Novell.Directory.Ldap.AuthenticationTypes)AuthenticationType);
                        }
                        catch(LdapException ex)                 {
                                throw ex;