dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Security/Policy AllMem


From: Rhys Weatherley <address@hidden>
Subject: [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Security/Policy AllMembershipCondition.cs,1.1,1.2 ApplicationDirectory.cs,1.2,1.3 ApplicationDirectoryMembershipCondition.cs,1.1,1.2 CodeGroup.cs,1.2,1.3 Evidence.cs,1.4,1.5 FileCodeGroup.cs,1.2,1.3 FirstMatchCodeGroup.cs,1.1,1.2 Hash.cs,1.3,1.4 HashMembershipCondition.cs,1.2,1.3IIdentityPermissionFactory.cs,1.1,1.2 IMembershipCondition.cs,1.1,1.2 NetCodeGroup.cs,1.2,1.3 PermissionRequestEvidence.cs,1.1,1.2 PolicyException.cs,1.2,1.3 PolicyLevel.cs,1.3,1.4 PolicyStatement.cs,1.1,1.2 PolicyStatementAttribute.cs,1.1,1.2 Publisher.cs,1.2,1.3 PublisherMembershipCondition.cs,1.2,1.3 Site.cs,1.1,1.2 SiteMembershipCondition.cs,1.1,1.2 StrongName.cs,1.1,1.2 StrongNameMembershipCondition.cs,1.1,1.2 UnionCodeGroup.cs,1.1,1.2 Url.cs,1.1,1.2 UrlMembershipCondition.cs,1.1,1.2 Zone.cs,1.1,1.2 ZoneMembershipCondition.cs,1.1,1.2
Date: Wed, 28 May 2003 23:13:02 -0400

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy
In directory subversions:/tmp/cvs-serv7044/runtime/System/Security/Policy

Modified Files:
        AllMembershipCondition.cs ApplicationDirectory.cs 
        ApplicationDirectoryMembershipCondition.cs CodeGroup.cs 
        Evidence.cs FileCodeGroup.cs FirstMatchCodeGroup.cs Hash.cs 
        HashMembershipCondition.cs IIdentityPermissionFactory.cs 
        IMembershipCondition.cs NetCodeGroup.cs 
        PermissionRequestEvidence.cs PolicyException.cs PolicyLevel.cs 
        PolicyStatement.cs PolicyStatementAttribute.cs Publisher.cs 
        PublisherMembershipCondition.cs Site.cs 
        SiteMembershipCondition.cs StrongName.cs 
        StrongNameMembershipCondition.cs UnionCodeGroup.cs Url.cs 
        UrlMembershipCondition.cs Zone.cs ZoneMembershipCondition.cs 
Log Message:


Add new profile options - CONFIG_PERMISSIONS and CONFIG_POLICY_OBJECTS.


Index: AllMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/AllMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** AllMembershipCondition.cs   7 Apr 2003 09:58:38 -0000       1.1
--- AllMembershipCondition.cs   29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  [Serializable]
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  [Serializable]
***************
*** 99,103 ****
  }; // class AllMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 99,103 ----
  }; // class AllMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: ApplicationDirectory.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/ApplicationDirectory.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ApplicationDirectory.cs     23 Apr 2003 05:39:50 -0000      1.2
--- ApplicationDirectory.cs     29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  [Serializable]
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  [Serializable]
***************
*** 88,92 ****
  }; // class ApplicationDirectory
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 88,92 ----
  }; // class ApplicationDirectory
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: ApplicationDirectoryMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/ApplicationDirectoryMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ApplicationDirectoryMembershipCondition.cs  7 Apr 2003 09:58:38 -0000       
1.1
--- ApplicationDirectoryMembershipCondition.cs  29 May 2003 03:12:58 -0000      
1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  [Serializable]
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  [Serializable]
***************
*** 102,106 ****
  }; // class ApplicationDirectoryMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 102,106 ----
  }; // class ApplicationDirectoryMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: CodeGroup.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/CodeGroup.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** CodeGroup.cs        25 Apr 2003 03:53:07 -0000      1.2
--- CodeGroup.cs        29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 276,280 ****
  }; // class CodeGroup
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 276,280 ----
  }; // class CodeGroup
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: Evidence.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/Evidence.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Evidence.cs 7 Apr 2003 09:58:38 -0000       1.4
--- Evidence.cs 29 May 2003 03:12:58 -0000      1.5
***************
*** 22,26 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 22,26 ----
  {
  
! #if CONFIG_PERMISSIONS && CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 353,359 ****
  }; // class Evidence
  
! #else // ECMA_COMPAT
  
! // Dummy class for ECMA compilation mode.
  
  public sealed class Evidence
--- 353,359 ----
  }; // class Evidence
  
! #else // !(CONFIG_PERMISSIONS && CONFIG_POLICY_OBJECTS)
  
! // Define a dummy Evidence class if we aren't using policy objects.
  
  public sealed class Evidence
***************
*** 363,367 ****
  }; // class Evidence
  
! #endif // ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 363,367 ----
  }; // class Evidence
  
! #endif // !(CONFIG_PERMISSIONS && CONFIG_POLICY_OBJECTS)
  
  }; // namespace System.Security.Policy

Index: FileCodeGroup.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/FileCodeGroup.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** FileCodeGroup.cs    25 Apr 2003 03:53:07 -0000      1.2
--- FileCodeGroup.cs    29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 146,150 ****
  }; // class FileCodeGroup
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 146,150 ----
  }; // class FileCodeGroup
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: FirstMatchCodeGroup.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/FirstMatchCodeGroup.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FirstMatchCodeGroup.cs      22 Apr 2003 04:43:34 -0000      1.1
--- FirstMatchCodeGroup.cs      29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 89,93 ****
  }; // class FirstMatchCodeGroup
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 89,93 ----
  }; // class FirstMatchCodeGroup
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: Hash.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/Hash.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Hash.cs     29 May 2003 01:22:42 -0000      1.3
--- Hash.cs     29 May 2003 03:12:58 -0000      1.4
***************
*** 23,27 ****
  {
  
! #if CONFIG_CRYPTO
  
  using System.Reflection;
--- 23,27 ----
  {
  
! #if CONFIG_CRYPTO && CONFIG_POLICY_OBJECTS
  
  using System.Reflection;
***************
*** 121,125 ****
  }; // class Hash
  
! #endif // CONFIG_CRYPTO
  
  }; // namespace System.Security.Policy
--- 121,125 ----
  }; // class Hash
  
! #endif // CONFIG_CRYPTO && CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: HashMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/HashMembershipCondition.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** HashMembershipCondition.cs  29 May 2003 01:22:42 -0000      1.2
--- HashMembershipCondition.cs  29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if CONFIG_CRYPTO
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_CRYPTO && CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 167,171 ****
  }; // class HashMembershipCondition
  
! #endif // CONFIG_CRYPTO
  
  }; // namespace System.Security.Policy
--- 167,171 ----
  }; // class HashMembershipCondition
  
! #endif // CONFIG_CRYPTO && CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: IIdentityPermissionFactory.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/IIdentityPermissionFactory.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** IIdentityPermissionFactory.cs       7 Apr 2003 09:58:38 -0000       1.1
--- IIdentityPermissionFactory.cs       29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  public interface IIdentityPermissionFactory
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS && CONFIG_PERMISSIONS
  
  public interface IIdentityPermissionFactory
***************
*** 33,37 ****
  }; // interface IIdentityPermissionFactory
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 33,37 ----
  }; // interface IIdentityPermissionFactory
  
! #endif // CONFIG_POLICY_OBJECTS && CONFIG_PERMISSIONS
  
  }; // namespace System.Security.Policy

Index: IMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/IMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** IMembershipCondition.cs     7 Apr 2003 09:58:38 -0000       1.1
--- IMembershipCondition.cs     29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  public interface IMembershipCondition
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  public interface IMembershipCondition
***************
*** 43,47 ****
  }; // interface IMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 43,47 ----
  }; // interface IMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: NetCodeGroup.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/NetCodeGroup.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NetCodeGroup.cs     25 Apr 2003 04:45:13 -0000      1.2
--- NetCodeGroup.cs     29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 101,105 ****
  }; // class NetCodeGroup
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 101,105 ----
  }; // class NetCodeGroup
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: PermissionRequestEvidence.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/PermissionRequestEvidence.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PermissionRequestEvidence.cs        22 Apr 2003 04:43:34 -0000      1.1
--- PermissionRequestEvidence.cs        29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  [Serializable]
--- 23,27 ----
  {
  
! #if CONFIG_PERMISSIONS && CONFIG_POLICY_OBJECTS
  
  [Serializable]
***************
*** 83,87 ****
  }; // class PermissionRequestEvidence
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 83,87 ----
  }; // class PermissionRequestEvidence
  
! #endif // CONFIG_PERMISSIONS && CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: PolicyException.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/PolicyException.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PolicyException.cs  26 May 2003 04:41:21 -0000      1.2
--- PolicyException.cs  29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System;
***************
*** 63,67 ****
  }; // class PolicyException
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 63,67 ----
  }; // class PolicyException
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: PolicyLevel.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/PolicyLevel.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PolicyLevel.cs      25 Apr 2003 03:53:07 -0000      1.3
--- PolicyLevel.cs      29 May 2003 03:12:58 -0000      1.4
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 103,106 ****
--- 103,108 ----
                        }
  
+ #if CONFIG_PERMISSIONS
+ 
        // Add an entry to the "named permission sets" list.
        public void AddNamedPermissionSet(NamedPermissionSet permSet)
***************
*** 130,146 ****
                        }
  
-       // Create a policy level object for the current application domain.
-       public static PolicyLevel CreateAppDomainLevel()
-                       {
-                               return new PolicyLevel("AppDomain");
-                       }
- 
-       // Load policy information from an XML element.
-       [TODO]
-       public void FromXml(SecurityElement e)
-                       {
-                               // TODO
-                       }
- 
        // Get a specific named permission set.
        public NamedPermissionSet GetNamedPermissionSet(String name)
--- 132,135 ----
***************
*** 160,181 ****
                        }
  
-       // Recover the last backed-up policy configuration.
-       public void Recover()
-                       {
-                               // Nothing to do here: we don't support backups.
-                       }
- 
-       // Remove an entry from the "full trust assembly" list.
-       [TODO]
-       public void RemoveFullTrustAssembly(StrongName sn)
-                       {
-                               // TODO
-                       }
-       [TODO]
-       public void RemoveFullTrustAssembly(StrongNameMembershipCondition snMC)
-                       {
-                               // TODO
-                       }
- 
        // Remove a named permission set.
        [TODO]
--- 149,152 ----
***************
*** 201,204 ****
--- 172,208 ----
                        }
  
+ #endif // CONFIG_PERMISSIONS
+ 
+       // Create a policy level object for the current application domain.
+       public static PolicyLevel CreateAppDomainLevel()
+                       {
+                               return new PolicyLevel("AppDomain");
+                       }
+ 
+       // Load policy information from an XML element.
+       [TODO]
+       public void FromXml(SecurityElement e)
+                       {
+                               // TODO
+                       }
+ 
+       // Recover the last backed-up policy configuration.
+       public void Recover()
+                       {
+                               // Nothing to do here: we don't support backups.
+                       }
+ 
+       // Remove an entry from the "full trust assembly" list.
+       [TODO]
+       public void RemoveFullTrustAssembly(StrongName sn)
+                       {
+                               // TODO
+                       }
+       [TODO]
+       public void RemoveFullTrustAssembly(StrongNameMembershipCondition snMC)
+                       {
+                               // TODO
+                       }
+ 
        // Reset to the default state.
        [TODO]
***************
*** 240,244 ****
  }; // class PolicyLevel
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 244,248 ----
  }; // class PolicyLevel
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: PolicyStatement.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/PolicyStatement.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PolicyStatement.cs  7 Apr 2003 09:58:38 -0000       1.1
--- PolicyStatement.cs  29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  [Serializable]
--- 23,33 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
! 
! #if !CONFIG_PERMISSIONS
! 
! public sealed class PolicyStatement {}
! 
! #else // CONFIG_PERMISSIONS
  
  [Serializable]
***************
*** 29,32 ****
--- 35,39 ----
        : ISecurityEncodable, ISecurityPolicyEncodable
  {
+ 
        // Internal state.
        private PermissionSet permSet;
***************
*** 125,129 ****
  }; // class PolicyStatement
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 132,138 ----
  }; // class PolicyStatement
  
! #endif // CONFIG_PERMISSIONS
! 
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: PolicyStatementAttribute.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/PolicyStatementAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PolicyStatementAttribute.cs 7 Apr 2003 09:58:38 -0000       1.1
--- PolicyStatementAttribute.cs 29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  [Flags]
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  [Flags]
***************
*** 36,40 ****
  }; // enum PolicyStatementAttribute
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 36,40 ----
  }; // enum PolicyStatementAttribute
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: Publisher.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/Publisher.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Publisher.cs        29 May 2003 01:22:42 -0000      1.2
--- Publisher.cs        29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if CONFIG_X509_CERTIFICATES
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_X509_CERTIFICATES && CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 29,33 ****
  
  [Serializable]
! public sealed class Publisher : IIdentityPermissionFactory
  {
        // Internal state.
--- 29,36 ----
  
  [Serializable]
! public sealed class Publisher
! #if CONFIG_PERMISSIONS
!       : IIdentityPermissionFactory
! #endif
  {
        // Internal state.
***************
*** 59,62 ****
--- 62,67 ----
                        }
  
+ #if CONFIG_PERMISSIONS
+ 
        // Implement the IIdentityPermissionFactory interface
        public IPermission CreateIdentityPermission(Evidence evidence)
***************
*** 65,68 ****
--- 70,75 ----
                        }
  
+ #endif
+ 
        // Determine if two objects are equal.
        public override bool Equals(Object obj)
***************
*** 95,99 ****
  }; // class Publisher
  
! #endif // CONFIG_X509_CERTIFICATES
  
  }; // namespace System.Security.Policy
--- 102,106 ----
  }; // class Publisher
  
! #endif // CONFIG_X509_CERTIFICATES && CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: PublisherMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/PublisherMembershipCondition.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PublisherMembershipCondition.cs     29 May 2003 01:22:42 -0000      1.2
--- PublisherMembershipCondition.cs     29 May 2003 03:12:58 -0000      1.3
***************
*** 23,27 ****
  {
  
! #if CONFIG_X509_CERTIFICATES
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_X509_CERTIFICATES && CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 124,128 ****
  }; // class PublisherMembershipCondition
  
! #endif // CONFIG_X509_CERTIFICATES
  
  }; // namespace System.Security.Policy
--- 124,128 ----
  }; // class PublisherMembershipCondition
  
! #endif // CONFIG_X509_CERTIFICATES && CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: Site.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/Site.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Site.cs     22 Apr 2003 04:43:34 -0000      1.1
--- Site.cs     29 May 2003 03:12:58 -0000      1.2
***************
*** 23,32 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class Site : IIdentityPermissionFactory
  {
        // Internal state.
--- 23,35 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class Site
! #if CONFIG_PERMISSIONS
!       : IIdentityPermissionFactory
! #endif
  {
        // Internal state.
***************
*** 69,72 ****
--- 72,77 ----
                        }
  
+ #if CONFIG_PERMISSIONS
+ 
        // Implement the IIdentityPermissionFactory interface
        public IPermission CreateIdentityPermission(Evidence evidence)
***************
*** 75,78 ****
--- 80,85 ----
                        }
  
+ #endif
+ 
        // Determine if two objects are equal.
        public override bool Equals(Object obj)
***************
*** 105,109 ****
  }; // class Site
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 112,116 ----
  }; // class Site
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: SiteMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/SiteMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SiteMembershipCondition.cs  22 Apr 2003 04:43:34 -0000      1.1
--- SiteMembershipCondition.cs  29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 123,127 ****
  }; // class SiteMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 123,127 ----
  }; // class SiteMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: StrongName.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/StrongName.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StrongName.cs       22 Apr 2003 04:43:34 -0000      1.1
--- StrongName.cs       29 May 2003 03:12:58 -0000      1.2
***************
*** 23,32 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class StrongName : IIdentityPermissionFactory
  {
        // Internal state.
--- 23,35 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class StrongName
! #if CONFIG_PERMISSIONS
!       : IIdentityPermissionFactory
! #endif
  {
        // Internal state.
***************
*** 85,88 ****
--- 88,93 ----
                        }
  
+ #if CONFIG_PERMISSIONS
+ 
        // Implement the IIdentityPermissionFactory interface
        public IPermission CreateIdentityPermission(Evidence evidence)
***************
*** 91,94 ****
--- 96,101 ----
                        }
  
+ #endif
+ 
        // Determine if two objects are equal.
        public override bool Equals(Object obj)
***************
*** 123,127 ****
  }; // class StrongName
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 130,134 ----
  }; // class StrongName
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: StrongNameMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/StrongNameMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** StrongNameMembershipCondition.cs    22 Apr 2003 04:43:34 -0000      1.1
--- StrongNameMembershipCondition.cs    29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 152,156 ****
  }; // class StrongNameMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 152,156 ----
  }; // class StrongNameMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: UnionCodeGroup.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/UnionCodeGroup.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** UnionCodeGroup.cs   22 Apr 2003 04:43:34 -0000      1.1
--- UnionCodeGroup.cs   29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Collections;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Collections;
***************
*** 89,93 ****
  }; // class UnionCodeGroup
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 89,93 ----
  }; // class UnionCodeGroup
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: Url.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/Url.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Url.cs      22 Apr 2003 04:43:34 -0000      1.1
--- Url.cs      29 May 2003 03:12:58 -0000      1.2
***************
*** 23,32 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class Url : IIdentityPermissionFactory
  {
        // Internal state.
--- 23,35 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class Url
! #if CONFIG_PERMISSIONS
!       : IIdentityPermissionFactory
! #endif
  {
        // Internal state.
***************
*** 58,61 ****
--- 61,66 ----
                        }
  
+ #if CONFIG_PERMISSIONS
+ 
        // Implement the IIdentityPermissionFactory interface
        public IPermission CreateIdentityPermission(Evidence evidence)
***************
*** 64,67 ****
--- 69,74 ----
                        }
  
+ #endif
+ 
        // Determine if two objects are equal.
        public override bool Equals(Object obj)
***************
*** 94,98 ****
  }; // class Url
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 101,105 ----
  }; // class Url
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: UrlMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/UrlMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** UrlMembershipCondition.cs   22 Apr 2003 04:43:34 -0000      1.1
--- UrlMembershipCondition.cs   29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 123,127 ****
  }; // class UrlMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 123,127 ----
  }; // class UrlMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: Zone.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/Zone.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Zone.cs     22 Apr 2003 04:43:34 -0000      1.1
--- Zone.cs     29 May 2003 03:12:58 -0000      1.2
***************
*** 23,32 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class Zone : IIdentityPermissionFactory
  {
        // Internal state.
--- 23,35 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
  
  [Serializable]
! public sealed class Zone
! #if CONFIG_PERMISSIONS
!       : IIdentityPermissionFactory
! #endif
  {
        // Internal state.
***************
*** 70,73 ****
--- 73,78 ----
                        }
  
+ #if CONFIG_PERMISSIONS
+ 
        // Implement the IIdentityPermissionFactory interface
        public IPermission CreateIdentityPermission(Evidence evidence)
***************
*** 76,79 ****
--- 81,86 ----
                        }
  
+ #endif
+ 
        // Determine if two objects are equal.
        public override bool Equals(Object obj)
***************
*** 104,108 ****
  }; // class Zone
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 111,115 ----
  }; // class Zone
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy

Index: ZoneMembershipCondition.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Policy/ZoneMembershipCondition.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ZoneMembershipCondition.cs  22 Apr 2003 04:43:34 -0000      1.1
--- ZoneMembershipCondition.cs  29 May 2003 03:12:58 -0000      1.2
***************
*** 23,27 ****
  {
  
! #if !ECMA_COMPAT
  
  using System.Security.Permissions;
--- 23,27 ----
  {
  
! #if CONFIG_POLICY_OBJECTS
  
  using System.Security.Permissions;
***************
*** 115,119 ****
  }; // class ZoneMembershipCondition
  
! #endif // !ECMA_COMPAT
  
  }; // namespace System.Security.Policy
--- 115,119 ----
  }; // class ZoneMembershipCondition
  
! #endif // CONFIG_POLICY_OBJECTS
  
  }; // namespace System.Security.Policy





reply via email to

[Prev in Thread] Current Thread [Next in Thread]