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

[tridge at samba.org]

Author: tridge
Date: 2005-01-27 23:22:12 +0000 (Thu, 27 Jan 2005)
New Revision: 5050

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

Log:
make sure we translate the generic to the specific bits before doing a
pvfs_access_check_unix().

Fixes a problem with the cifsfs filesystem




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	2005-01-27 22:36:25 UTC (rev 5049)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_acl.c	2005-01-27 23:22:12 UTC (rev 5050)
@@ -372,6 +372,10 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
+	/* expand the generic access bits to file specific bits */
+	*access_mask = pvfs_translate_mask(*access_mask);
+	*access_mask &= ~SEC_FILE_READ_ATTRIBUTE;
+
 	status = pvfs_acl_load(pvfs, name, -1, acl);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
 		talloc_free(acl);
@@ -389,11 +393,6 @@
 		return NT_STATUS_INVALID_ACL;
 	}
 
-	/* expand the generic access bits to file specific bits */
-	*access_mask = pvfs_translate_mask(*access_mask);
-
-	*access_mask &= ~SEC_FILE_READ_ATTRIBUTE;
-
 	/* check the acl against the required access mask */
 	status = sec_access_check(sd, token, *access_mask, access_mask);