Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kirzner <borisk@mono-cvs.ximian.com>2005-06-20 11:52:54 +0400
committerBoris Kirzner <borisk@mono-cvs.ximian.com>2005-06-20 11:52:54 +0400
commit602df6df30124626a352cf66ba0e3d247d9e0d02 (patch)
tree084dda00f5ed8bde1d91f8b21a9e235113fedab8 /mcs/class/Novell.Directory.Ldap
parent7f93b196041e0e482854acde662eb7e2cacac864 (diff)
Added ifdef to exclude the code not used in TARGET_JVM.
svn path=/trunk/mcs/; revision=46232
Diffstat (limited to 'mcs/class/Novell.Directory.Ldap')
-rw-r--r--mcs/class/Novell.Directory.Ldap/ChangeLog6
-rwxr-xr-xmcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs2
-rwxr-xr-xmcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs11
-rwxr-xr-xmcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapConnection.cs2
4 files changed, 20 insertions, 1 deletions
diff --git a/mcs/class/Novell.Directory.Ldap/ChangeLog b/mcs/class/Novell.Directory.Ldap/ChangeLog
index 4ebf19360b6..ba0d30d019c 100644
--- a/mcs/class/Novell.Directory.Ldap/ChangeLog
+++ b/mcs/class/Novell.Directory.Ldap/ChangeLog
@@ -1,3 +1,9 @@
+2005-19-06 Boris Kirzner <borisk@mainsoft.com>
+ * Novell.Directory.Ldap/AssemblyInfo.cs,
+ Novell.Directory.Ldap/Connection.cs,
+ Novell.Directory.Ldap/LdapConnection.cs:
+ added ifdef to exclude the code not used in TARGET_JVM.
+
2005-04-05 Boris Kirzner <borisk@mainsoft.com>
* Added Novell.Directory.Ldap.Rfc2251/RfcLdapSuperDN.cs to sources.
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
index e85dea0e6d7..f96aa01595d 100755
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/AssemblyInfo.cs
@@ -69,6 +69,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyVersion ("1.0.3300.0")]
#endif
+#if (!TARGET_JVM)
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../mono.pub")]
+#endif
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 98d3816cd9a..99b1fed6a64 100755
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/Connection.cs
@@ -34,8 +34,10 @@ using System.Threading;
using Novell.Directory.Ldap.Asn1;
using Novell.Directory.Ldap.Rfc2251;
using Novell.Directory.Ldap.Utilclass;
+#if !TARGET_JVM
using Mono.Security.Protocol.Tls;
using Mono.Security.X509.Extensions;
+#endif
using Syscert = System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography;
using System.Net;
@@ -43,7 +45,9 @@ using System.Net.Sockets;
using System.Collections;
using System.IO;
using System.Text;
+#if !TARGET_JVM
using Mono.Security.X509;
+#endif
using System.Text.RegularExpressions;
using System.Globalization;
@@ -682,6 +686,7 @@ namespace Novell.Directory.Ldap
{
if ((in_Renamed == null) || (out_Renamed == null))
{
+#if !TARGET_JVM
if(Ssl)
{
this.host = host;
@@ -704,10 +709,13 @@ namespace Novell.Directory.Ldap
out_Renamed = (System.IO.Stream) sslstream;
}
else{
+#endif
socket = new System.Net.Sockets.TcpClient(host, port);
in_Renamed = (System.IO.Stream) socket.GetStream();
out_Renamed = (System.IO.Stream) socket.GetStream();
+#if !TARGET_JVM
}
+#endif
}
else
{
@@ -1113,7 +1121,7 @@ namespace Novell.Directory.Ldap
/* package */
internal void startTLS()
{
-
+#if !TARGET_JVM
try
{
waitForReader(null);
@@ -1145,6 +1153,7 @@ namespace Novell.Directory.Ldap
throw new LdapException("The host is unknown", LdapException.CONNECT_ERROR, null, uhe);
}
return ;
+#endif
}
/*
diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapConnection.cs b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapConnection.cs
index 973516b0d45..2d6b656e9f7 100755
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapConnection.cs
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap/LdapConnection.cs
@@ -34,7 +34,9 @@ using Novell.Directory.Ldap;
using Novell.Directory.Ldap.Asn1;
using Novell.Directory.Ldap.Rfc2251;
using Novell.Directory.Ldap.Utilclass;
+#if !TARGET_JVM
using Mono.Security.Protocol.Tls;
+#endif
using System.Security.Cryptography.X509Certificates;
namespace Novell.Directory.Ldap