X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Runtime.Remoting%2FRemotingConfiguration.cs;h=108c1ec4ef11aad6231ecef8f1553118bc294acc;hb=2c72d3253a15f9ba592c17d20e765852b0aef36a;hp=802ba8b3eaf6c3bb0031ae979bddf3c3187cfde3;hpb=93703b4ef8bdcf1d6cf336e14f534454221730c5;p=mono.git diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs index 802ba8b3eaf..108c1ec4ef1 100644 --- 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) {