Merge pull request #2543 from ermshiperete/Xamarin-31021

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

diff --git a/mcs/class/corlib/System.Security.AccessControl/FileSystemAccessRule.cs b/mcs/class/corlib/System.Security.AccessControl/FileSystemAccessRule.cs
index 59c2b6339134526dad3a9bd15147d999a76b8da0..7a369805379af86bc25ae8435ba594d0ea667a86 100644 (file)
--- a/mcs/class/corlib/System.Security.AccessControl/FileSystemAccessRule.cs
+++ b/mcs/class/corlib/System.Security.AccessControl/FileSystemAccessRule.cs
@@ -1,10 +1,11 @@
 //
 // System.Security.AccessControl.FileSystemAccessRule implementation
 //
-// Author:
+// Authors:
 //     Dick Porter  <dick@ximian.com>
+//     Atsushi Enomoto  <atsushi@ximian.com>
 //
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2006-2007 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
@@ -26,27 +27,24 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System.Security.Principal;
 
-namespace System.Security.AccessControl {
+namespace System.Security.AccessControl
+{
        public sealed class FileSystemAccessRule : AccessRule
        {
-               FileSystemRights fileSystemRights;
-               
                public FileSystemAccessRule (IdentityReference identity,
                                             FileSystemRights fileSystemRights,
                                             AccessControlType type)
+                       : this (identity, fileSystemRights, InheritanceFlags.None, PropagationFlags.None, type)
                {
-                       this.fileSystemRights = fileSystemRights;
                }
 
                public FileSystemAccessRule (string identity,
                                             FileSystemRights fileSystemRights,
                                             AccessControlType type)
+                       : this (new NTAccount (identity), fileSystemRights, InheritanceFlags.None, PropagationFlags.None, type)
                {
-                       this.fileSystemRights = fileSystemRights;
                }
 
                public FileSystemAccessRule (IdentityReference identity,
@@ -54,8 +52,18 @@ namespace System.Security.AccessControl {
                                             InheritanceFlags inheritanceFlags,
                                             PropagationFlags propagationFlags,
                                             AccessControlType type)
+                       : this (identity, fileSystemRights, false, inheritanceFlags, propagationFlags, type)
+               {
+               }
+               
+               internal FileSystemAccessRule (IdentityReference identity,
+                                              FileSystemRights fileSystemRights,
+                                              bool isInherited,
+                                              InheritanceFlags inheritanceFlags,
+                                              PropagationFlags propagationFlags,
+                                              AccessControlType type)
+                       : base (identity, (int) fileSystemRights, isInherited, inheritanceFlags, propagationFlags, type)
                {
-                       this.fileSystemRights = fileSystemRights;
                }
                
                public FileSystemAccessRule (string identity,
@@ -63,17 +71,13 @@ namespace System.Security.AccessControl {
                                             InheritanceFlags inheritanceFlags,
                                             PropagationFlags propagationFlags,
                                             AccessControlType type)
+                       : this (new NTAccount (identity), fileSystemRights, inheritanceFlags, propagationFlags, type)
                {
-                       this.fileSystemRights = fileSystemRights;
                }
                
-               public FileSystemRights FileSystemRights
-               {
-                       get {
-                               return(fileSystemRights);
-                       }
+               public FileSystemRights FileSystemRights {
+                       get { return (FileSystemRights)AccessMask; }
                }
        }
 }
 
-#endif