2008-11-18 Gonzalo Paniagua Javier <gonzalo@novell.com>

[mono.git] / mcs / class / System / System.Net / NtlmClient.cs

diff --git a/mcs/class/System/System.Net/NtlmClient.cs b/mcs/class/System/System.Net/NtlmClient.cs
index 0f5aac544e41f6be97e39a9f88f7fbdc621fd9f0..37257a3659ba275c65cbb45aedb9a02c13df3e28 100644 (file)
--- a/mcs/class/System/System.Net/NtlmClient.cs
+++ b/mcs/class/System/System.Net/NtlmClient.cs
@@ -9,6 +9,27 @@
 // (c) 2003 Novell, Inc. (http://www.novell.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Reflection;
 
@@ -21,7 +42,7 @@ namespace System.Net
 
                static NtlmClient ()
                {
-                       Assembly ass = Assembly.Load ("Mono.Security");
+                       Assembly ass = Assembly.Load (Consts.AssemblyMono_Http);
                        if (ass != null)
                                ntlmAuthType = ass.GetType ("Mono.Http.NtlmClient", false);
                }
@@ -42,10 +63,7 @@ namespace System.Net
 
                public Authorization PreAuthenticate (WebRequest webRequest, ICredentials credentials) 
                {
-                       if (authObject == null)
-                               return null;
-
-                       return authObject.PreAuthenticate (webRequest, credentials);
+                       return null;
                }
        
                public string AuthenticationType { 
@@ -53,7 +71,7 @@ namespace System.Net
                }
        
                public bool CanPreAuthenticate { 
-                       get { return true; }
+                       get { return false; }
                }
        }
 }