Author: spouliot
Date: 2005-03-02 08:51:18 -0500 (Wed, 02 Mar 2005)
New Revision: 41358
Modified:
trunk/mcs/class/corlib/System.Security/ChangeLog
trunk/mcs/class/corlib/System.Security/CodeAccessPermission.cs
trunk/mcs/class/corlib/System.Security/PermissionSet.cs
Log:
2005-03-02 Sebastien Pouliot <[EMAIL PROTECTED]>
* CodeAccessPermission.cs,
* PermissionSet.cs: Don't throw NotSupportedException if the security
manager (SecurityManager.SecurityEnabled) is off.
Modified: trunk/mcs/class/corlib/System.Security/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Security/ChangeLog 2005-03-02 12:17:46 UTC
(rev 41357)
+++ trunk/mcs/class/corlib/System.Security/ChangeLog 2005-03-02 13:51:18 UTC
(rev 41358)
@@ -1,3 +1,9 @@
+2005-03-02 Sebastien Pouliot <[EMAIL PROTECTED]>
+
+ * CodeAccessPermission.cs,
+ * PermissionSet.cs: Don't throw NotSupportedException if the security
+ manager (SecurityManager.SecurityEnabled) is off.
+
2005-02-25 Sebastien Pouliot <[EMAIL PROTECTED]>
* CodeAccessPermission.cs: Implement Equals for NET_2_0 profile.
Modified: trunk/mcs/class/corlib/System.Security/CodeAccessPermission.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security/CodeAccessPermission.cs
2005-03-02 12:17:46 UTC (rev 41357)
+++ trunk/mcs/class/corlib/System.Security/CodeAccessPermission.cs
2005-03-02 13:51:18 UTC (rev 41358)
@@ -160,6 +160,9 @@
[MonoTODO ("Imperative mode isn't supported")]
public static void RevertAll ()
{
+ if (!SecurityManager.SecurityEnabled)
+ return;
+
SecurityFrame sf = new SecurityFrame (1);
bool revert = false;
if ((sf.Assert != null) &&
!sf.Assert.DeclarativeSecurity) {
@@ -189,6 +192,9 @@
[MonoTODO ("Imperative mode isn't supported")]
public static void RevertAssert ()
{
+ if (!SecurityManager.SecurityEnabled)
+ return;
+
SecurityFrame sf = new SecurityFrame (1);
if ((sf.Assert != null) &&
!sf.Assert.DeclarativeSecurity) {
// TODO
@@ -202,6 +208,9 @@
[MonoTODO ("Imperative mode isn't supported")]
public static void RevertDeny ()
{
+ if (!SecurityManager.SecurityEnabled)
+ return;
+
SecurityFrame sf = new SecurityFrame (1);
if ((sf.Deny != null) && !sf.Deny.DeclarativeSecurity) {
// TODO
@@ -215,6 +224,9 @@
[MonoTODO ("Imperative mode isn't supported")]
public static void RevertPermitOnly ()
{
+ if (!SecurityManager.SecurityEnabled)
+ return;
+
SecurityFrame sf = new SecurityFrame (1);
if ((sf.PermitOnly != null) &&
sf.PermitOnly.DeclarativeSecurity) {
// TODO
Modified: trunk/mcs/class/corlib/System.Security/PermissionSet.cs
===================================================================
--- trunk/mcs/class/corlib/System.Security/PermissionSet.cs 2005-03-02
12:17:46 UTC (rev 41357)
+++ trunk/mcs/class/corlib/System.Security/PermissionSet.cs 2005-03-02
13:51:18 UTC (rev 41358)
@@ -157,7 +157,7 @@
}
// note: we must ignore the stack modifiers for the
non-CAS permissions
- if (count > 0)
+ if (SecurityManager.SecurityEnabled && (count > 0))
throw new NotSupportedException ("Currently
only declarative Assert are supported.");
}
@@ -246,6 +246,9 @@
[MonoTODO ("Imperative mode isn't supported")]
public virtual void Deny ()
{
+ if (!SecurityManager.SecurityEnabled)
+ return;
+
foreach (IPermission p in list) {
// note: we ignore non-CAS permissions
if (p is IStackWalk) {
@@ -335,6 +338,9 @@
[MonoTODO ("Imperative mode isn't supported")]
public virtual void PermitOnly ()
{
+ if (!SecurityManager.SecurityEnabled)
+ return;
+
foreach (IPermission p in list) {
// note: we ignore non-CAS permissions
if (p is IStackWalk) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
