TARGET_J2EE/JVM fixes

[mono.git] / mcs / class / corlib / System.Security / SecurityManager.cs

diff --git a/mcs/class/corlib/System.Security/SecurityManager.cs b/mcs/class/corlib/System.Security/SecurityManager.cs
index 4fe92082ef92018cc04528e3ce32b37b16f64dcd..6016ddeb37fd7bff1eea28c0e4abd7f0a9fa6078 100644 (file)
--- a/mcs/class/corlib/System.Security/SecurityManager.cs
+++ b/mcs/class/corlib/System.Security/SecurityManager.cs
@@ -99,7 +99,7 @@ namespace System.Security {
                // NOTE: This method doesn't show in the class library status page because
                // it cannot be "found" with the StrongNameIdentityPermission for ECMA key.
                // But it's there!
-               [MonoTODO]
+               [MonoTODO ("works for fulltrust (empty), documentation doesn't really make sense, type wise")]
                [StrongNameIdentityPermission (SecurityAction.LinkDemand, PublicKey = "0x00000000000000000400000000000000")]
                public static void GetZoneAndOrigin (out ArrayList zone, out ArrayList origin) 
                {
@@ -182,8 +182,18 @@ namespace System.Security {
                        foreach (IPermission p in ps) {
                                // note: this may contains non CAS permissions
                                if ((!noncas) && (p is CodeAccessPermission)) {
-                                       if (!SecurityManager.IsGranted (a, p))
+#if NET_2_0
+                                       if (!IsGranted (a, p))
                                                return p;
+#else
+                                       if (p is IUnrestrictedPermission) {
+                                               if (!IsGranted (a, p))
+                                                       return p;
+                                       } else {
+                                               if (!IsGrantedRestricted (a, p))
+                                                       return p;
+                                       }
+#endif
                                } else {
                                        // but non-CAS will throw on failure...
                                        try {
@@ -296,7 +306,7 @@ namespace System.Security {
                }
 
 #if NET_2_0
-               [MonoTODO ("more tests are needed")]
+               [MonoTODO ("(2.0) more tests are needed")]
                public static PermissionSet ResolvePolicy (Evidence[] evidences)
                {
                        if ((evidences == null) || (evidences.Length == 0) ||