Merge pull request #5206 from alexrp/profiler-gc-base-init

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

diff --git a/mcs/class/System/System.Net/AuthenticationManager.cs b/mcs/class/System/System.Net/AuthenticationManager.cs
index 4ffe5f00efadcfe9db8ed212ca04176144c63412..89562a5b4c2e4afdd9627a258c2bae46a2920932 100644 (file)
--- a/mcs/class/System/System.Net/AuthenticationManager.cs
+++ b/mcs/class/System/System.Net/AuthenticationManager.cs
@@ -36,11 +36,7 @@ using System.Net.Configuration;
 
 namespace System.Net
 {
-#if MOONLIGHT
-       internal class AuthenticationManager {
-#else
        public class AuthenticationManager {
-#endif
                static ArrayList modules;
                static object locker = new object ();
 
@@ -55,7 +51,7 @@ namespace System.Net
                                        return;
                                
                                modules = new ArrayList ();
-#if NET_2_1
+#if MOBILE
                                modules.Add (new NtlmClient ());
                                modules.Add (new DigestClient ());
                                modules.Add (new BasicClient ());
@@ -73,7 +69,9 @@ namespace System.Net
                                        }
                                }
 #else
+#pragma warning disable 618
                                ConfigurationSettings.GetConfig ("system.net/authenticationModules");
+#pragma warning restore 618
 #endif
                        }
                }
@@ -110,6 +108,13 @@ namespace System.Net
                        }
                }
 
+               [MonoTODO]
+               internal static bool OSSupportsExtendedProtection {
+                       get {
+                               return false;
+                       }
+               }
+
                internal static void Clear ()
                {
                        EnsureModules ();
@@ -140,7 +145,7 @@ namespace System.Net
                                        if (auth == null)
                                                continue;
 
-                                       auth.Module = mod;
+                                       auth.ModuleAuthenticationType = mod.AuthenticationType;
                                        return auth;
                                }
                        }
@@ -163,7 +168,7 @@ namespace System.Net
                                        if (auth == null)
                                                continue;
 
-                                       auth.Module = mod;
+                                       auth.ModuleAuthenticationType = mod.AuthenticationType;
                                        return auth;
                                }
                        }