2007-05-02 Jonathan Chambers <joncham@gmail.com>

	* RemotingConfiguration.cs: Added Configure overload for 2.0
	with MonoTODO for security.

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

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index b6fa8475f79e6cfef053164ec73c157cdc731464..882bbae9f5146b95c527df303a412b3855d81523 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-02  Jonathan Chambers  <joncham@gmail.com>
+
+       * RemotingConfiguration.cs: Added Configure overload for 2.0
+       with MonoTODO for security.
+
 2006-12-18  Lluis Sanchez Gual  <lluis@novell.com>
 
        * RemotingServices.cs: FieldSetter and FieldGetter methods need

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
index 802ba8b3eaf6c3bb0031ae979bddf3c3187cfde3..108c1ec4ef11aad6231ecef8f1553118bc294acc 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
@@ -98,20 +98,29 @@ namespace System.Runtime.Remoting
 
                // public methods
                
-               public static void Configure (string filename) 
+#if NET_2_0
+               [MonoTODO ("Implement ensureSecurity")]
+               public
+#else
+               internal
+#endif
+               static void Configure (string filename, bool ensureSecurity) 
                {
-                       lock (channelTemplates)
-                       {
-                               if (!defaultConfigRead)
-                               {
+                       lock (channelTemplates) {
+                               if (!defaultConfigRead) {
                                        ReadConfigFile (Environment.GetMachineConfigPath ());
                                        defaultConfigRead = true;
                                }
-                               
+
                                if (filename != null)
                                        ReadConfigFile (filename);
                        }
                }
+               
+               public static void Configure (string filename) 
+               {
+                       Configure (filename, false);
+               }
 
                private static void ReadConfigFile (string filename)
                {