summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-11 12:37:56 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-11 14:16:25 +0200
commitb3b69064d32c921c010b60d12551d450ed4be7c9 (patch)
tree7d2cc0b440e0f5da323a525170159fd1ed83555d
parent85da480c64b41f1d0e3722f6585f7c33e8724cf4 (diff)
downloadsamba-b3b69064d32c921c010b60d12551d450ed4be7c9.tar.gz
samba-b3b69064d32c921c010b60d12551d450ed4be7c9.tar.bz2
samba-b3b69064d32c921c010b60d12551d450ed4be7c9.zip
s3:vfs_acl_common: also parse xattr.NTACL version 1
This is what the source4/ntvfs/posix code uses. It's also used at provision time to setup the sysvol permissions. metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Tue Oct 11 14:16:25 CEST 2011 on sn-devel-104
-rw-r--r--source3/modules/vfs_acl_common.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 2ed3cac216..1947a77f07 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -93,6 +93,18 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
}
switch (xacl.version) {
+ case 1:
+ *ppdesc = make_sec_desc(ctx, SD_REVISION,
+ xacl.info.sd->type | SEC_DESC_SELF_RELATIVE,
+ xacl.info.sd->owner_sid,
+ xacl.info.sd->group_sid,
+ xacl.info.sd->sacl,
+ xacl.info.sd->dacl,
+ &sd_size);
+ /* No hash - null out. */
+ *p_hash_type = XATTR_SD_HASH_TYPE_NONE;
+ memset(hash, '\0', XATTR_SD_HASH_SIZE);
+ break;
case 2:
*ppdesc = make_sec_desc(ctx, SD_REVISION,
xacl.info.sd_hs2->sd->type | SEC_DESC_SELF_RELATIVE,