[SCM] Samba Shared Repository - branch master updated - 87f563c2308b761bc9c42caf5ab240746004e908

[Jeremy Allison]

The branch, master has been updated
       via  87f563c2308b761bc9c42caf5ab240746004e908 (commit)
      from  7522ef15aca2429ef57c75d8297dd8121e79c9da (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 87f563c2308b761bc9c42caf5ab240746004e908
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Thu Nov 6 01:58:56 2008 -0800

    Start factoring out the inheritance differences.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/secdesc.c           |    3 +--
 source3/modules/vfs_acl_xattr.c |    3 +--
 source4/torture/raw/acls.c      |    4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 2987306..94d2495 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 c6fb0b5..209209d 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 862b96a..d76454d 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;


-- 
Samba Shared Repository