diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-06 01:58:56 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-06 01:58:56 -0800 |
| commit | 87f563c2308b761bc9c42caf5ab240746004e908 (patch) | |
| tree | 6d6be1f2471828beb4453a8dda819734d1c0903f | |
| parent | 7522ef15aca2429ef57c75d8297dd8121e79c9da (diff) | |
| download | samba-87f563c2308b761bc9c42caf5ab240746004e908.tar.gz samba-87f563c2308b761bc9c42caf5ab240746004e908.tar.bz2 samba-87f563c2308b761bc9c42caf5ab240746004e908.zip | |
Start factoring out the inheritance differences.
Jeremy.
| -rw-r--r-- | source3/lib/secdesc.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_xattr.c | 3 | ||||
| -rw-r--r-- | source4/torture/raw/acls.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 2987306066..94d249564f 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -574,8 +574,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, } *ppsd = make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1, - SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT| - SEC_DESC_DACL_DEFAULTED, + SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT, owner_sid, group_sid, NULL, diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c index c6fb0b5907..209209d287 100644 --- a/source3/modules/vfs_acl_xattr.c +++ b/source3/modules/vfs_acl_xattr.c @@ -326,8 +326,7 @@ static struct security_descriptor *default_file_sd(TALLOC_CTX *mem_ctx, } return make_sec_desc(mem_ctx, SECURITY_DESCRIPTOR_REVISION_1, - SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT| - SEC_DESC_DACL_DEFAULTED, + SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT, &owner_sid, &group_sid, NULL, diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index 862b96ac17..d76454d1ff 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -1410,7 +1410,9 @@ static bool test_inheritance(struct torture_context *tctx, if (!(test_flags[i].parent_flags & SEC_ACE_FLAG_OBJECT_INHERIT)) { if (!security_descriptor_equal(q.query_secdesc.out.sd, sd_def)) { - printf("Expected default sd at %d - got:\n", i); + printf("Expected default sd:\n"); + NDR_PRINT_DEBUG(security_descriptor, sd_def); + printf("at %d - got:\n", i); NDR_PRINT_DEBUG(security_descriptor, q.query_secdesc.out.sd); } goto check_dir; |