Start factoring out the inheritance differences.

Jeremy.

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 298730606668b767134fd1fba72e40858b0b9812..94d249564f8b491d0152bcb7b17e29c2c46df569 100644 (file)
--- 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 c6fb0b5907caf46980c011a03033806714296957..209209d287627a450b658c07fbf25885be07876c 100644 (file)
--- 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 862b96ac1730218fd6fd980f21408e5e8a6fc520..d76454d1ff4417fff928b61483a77700b334cfc7 100644 (file)
--- 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;