svn commit: samba r3995 - in branches/SAMBA_4_0/source/ntvfs/posix: .

[tridge at samba.org]

Author: tridge
Date: 2004-11-29 06:42:02 +0000 (Mon, 29 Nov 2004)
New Revision: 3995

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3995

Log:
improved the default ACL mapping from unix perms

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c	2004-11-29 06:19:50 UTC (rev 3994)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c	2004-11-29 06:42:02 UTC (rev 3995)
@@ -83,15 +83,17 @@
 			SA_RIGHT_FILE_READ_DATA | 
 			SA_RIGHT_FILE_READ_EA |
 			SA_RIGHT_FILE_READ_ATTRIBUTES |
-			SA_RIGHT_FILE_EXECUTE;
+			SA_RIGHT_FILE_EXECUTE |
+			STD_RIGHT_SYNCHRONIZE_ACCESS |
+			STD_RIGHT_READ_CONTROL_ACCESS;
 	}
 	if (mode & S_IWUSR) {
 		access_masks[1] |= 
 			SA_RIGHT_FILE_WRITE_DATA | 
 			SA_RIGHT_FILE_APPEND_DATA |
 			SA_RIGHT_FILE_WRITE_EA |
-			SA_RIGHT_FILE_DELETE_CHILD |
-			SA_RIGHT_FILE_WRITE_ATTRIBUTES;
+			SA_RIGHT_FILE_WRITE_ATTRIBUTES |
+			STD_RIGHT_DELETE_ACCESS;
 	}
 
 	if (mode & S_IRGRP) {
@@ -99,14 +101,15 @@
 			SA_RIGHT_FILE_READ_DATA | 
 			SA_RIGHT_FILE_READ_EA |
 			SA_RIGHT_FILE_READ_ATTRIBUTES |
-			SA_RIGHT_FILE_EXECUTE;
+			SA_RIGHT_FILE_EXECUTE |
+			STD_RIGHT_SYNCHRONIZE_ACCESS |
+			STD_RIGHT_READ_CONTROL_ACCESS;
 	}
 	if (mode & S_IWGRP) {
 		access_masks[2] |= 
 			SA_RIGHT_FILE_WRITE_DATA | 
 			SA_RIGHT_FILE_APPEND_DATA |
 			SA_RIGHT_FILE_WRITE_EA |
-			SA_RIGHT_FILE_DELETE_CHILD |
 			SA_RIGHT_FILE_WRITE_ATTRIBUTES;
 	}
 
@@ -115,14 +118,15 @@
 			SA_RIGHT_FILE_READ_DATA | 
 			SA_RIGHT_FILE_READ_EA |
 			SA_RIGHT_FILE_READ_ATTRIBUTES |
-			SA_RIGHT_FILE_EXECUTE;
+			SA_RIGHT_FILE_EXECUTE |
+			STD_RIGHT_SYNCHRONIZE_ACCESS |
+			STD_RIGHT_READ_CONTROL_ACCESS;
 	}
 	if (mode & S_IWOTH) {
 		access_masks[3] |= 
 			SA_RIGHT_FILE_WRITE_DATA | 
 			SA_RIGHT_FILE_APPEND_DATA |
 			SA_RIGHT_FILE_WRITE_EA |
-			SA_RIGHT_FILE_DELETE_CHILD |
 			SA_RIGHT_FILE_WRITE_ATTRIBUTES;
 	}