X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Security.Permissions%2FPrincipalPermissionAttribute.cs;h=2dd9f04994dc185e1b2f4f0ee55dddafd7c8c249;hb=b0eff411fcc55fa6a7bbc5ee97bb592fe3204309;hp=85dcca5faf9cd7a7f5d8eafb531e42b011fb9a35;hpb=6b74fcb4e3218df607b828de8c28ca250fbeb9b9;p=mono.git

diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs
index 85dcca5faf9..2dd9f04994d 100644
--- a/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs
+++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs
@@ -1,19 +1,41 @@
 //
 // System.Security.Permissions.PrincipalPermissionAttribute.cs
 //
-// Duncan Mak <duncan@ximian.com>
+// Authors:
+//	Duncan Mak <duncan@ximian.com>
+//	Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) 2002 Ximian, Inc. http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Security.Permissions;
+using System.Runtime.InteropServices;
 
 namespace System.Security.Permissions {
 
-	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
-			 AttributeTargets.Struct | AttributeTargets.Constructor |
-			 AttributeTargets.Method)]
+#if NET_2_0
+	[ComVisible (true)]
+#endif
+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Method, AllowMultiple=true, Inherited=false)]
 	[Serializable]
 	public sealed class PrincipalPermissionAttribute : CodeAccessSecurityAttribute {
 
@@ -26,23 +48,21 @@ namespace System.Security.Permissions {
 		public PrincipalPermissionAttribute (SecurityAction action)
 			: base (action)
 		{
+			authenticated = true; // strange but true ;)
 		}
 
 		// Properties
-		public bool Authenticated
-		{
+		public bool Authenticated {
 			get { return authenticated; }
 			set { authenticated = value; }
 		}
-			 			 
-		public string Name
-		{
+
+		public string Name {
 			get { return name; }
 			set { name = value; }
 		}
-			 
-		public string Role
-		{
+
+		public string Role {
 			get { return role; }
 			set { role = value; }
 		}
@@ -50,7 +70,12 @@ namespace System.Security.Permissions {
 		// Method
 		public override IPermission CreatePermission ()
 		{
-			return new PrincipalPermission (name, role, authenticated);
+			PrincipalPermission perm = null;
+			if (this.Unrestricted)
+				perm = new PrincipalPermission (PermissionState.Unrestricted);
+			else
+				perm = new PrincipalPermission (name, role, authenticated);
+			return perm;
 		}
 	}
 }