diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 12:52:18 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 12:52:18 +0200 |
| commit | d4474ba470a70ce0476156a9399193ec024bb455 (patch) | |
| tree | b7ae06c344087d331edee03e823969b30dc62678 /source3/modules | |
| parent | a531537341d874ed2bfa7058ec45417e856bed4e (diff) | |
| download | samba-d4474ba470a70ce0476156a9399193ec024bb455.tar.gz samba-d4474ba470a70ce0476156a9399193ec024bb455.tar.bz2 samba-d4474ba470a70ce0476156a9399193ec024bb455.zip | |
s3-secdesc: use SD_REVISION from security.idl.
Guenther
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_common.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 3201fa5482..72e7aeb2fd 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -321,7 +321,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf, } DEBUG(10,("after make sec_acl\n")); - *ppdesc = make_sec_desc(mem_ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, + *ppdesc = make_sec_desc(mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE, (security_info & OWNER_SECURITY_INFORMATION) ? &sid_owner : NULL, (security_info & GROUP_SECURITY_INFORMATION) ? &sid_group : NULL, NULL, psa, &sd_size); diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 00ba208816..46d54c2d81 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -88,7 +88,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob, switch (xacl.version) { case 2: - *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION, + *ppdesc = make_sec_desc(ctx, SD_REVISION, xacl.info.sd_hs2->sd->type | SEC_DESC_SELF_RELATIVE, xacl.info.sd_hs2->sd->owner_sid, xacl.info.sd_hs2->sd->group_sid, @@ -100,7 +100,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob, memset(hash, '\0', XATTR_SD_HASH_SIZE); break; case 3: - *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION, + *ppdesc = make_sec_desc(ctx, SD_REVISION, xacl.info.sd_hs3->sd->type | SEC_DESC_SELF_RELATIVE, xacl.info.sd_hs3->sd->owner_sid, xacl.info.sd_hs3->sd->group_sid, diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 41af84fb59..64c8ffc22e 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -642,7 +642,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl, if (psa == NULL) return 0; - *ppdesc = make_sec_desc(mem_ctx, SEC_DESC_REVISION, + *ppdesc = make_sec_desc(mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE, (security_info & OWNER_SECURITY_INFORMATION) ? &owner_sid : NULL, |