[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  93bca18 Make sure that we only propogate the INHERITED flag when we are allowed to.
      from  97bb3cc torture: Add ntprinting latin1 test.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 93bca1881e3a8993c76fec408d7c0c369556683d
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 28 09:36:41 2013 -0700

    Make sure that we only propogate the INHERITED flag when we are allowed to.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Fix bug #9747 - When creating a directory Samba allows inherited bit to slip
    through.

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

Summary of changes:
 source3/lib/secdesc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index b7c9fc5..7ff3a6a 100644
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -602,7 +602,8 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
 		if (!container) {
 			new_flags = 0;
 		} else {
-			new_flags &= ~SEC_ACE_FLAG_INHERIT_ONLY;
+			new_flags &= ~(SEC_ACE_FLAG_INHERIT_ONLY|
+					SEC_ACE_FLAG_INHERITED_ACE);
 
 			if (!(new_flags & SEC_ACE_FLAG_CONTAINER_INHERIT)) {
 				new_flags |= SEC_ACE_FLAG_INHERIT_ONLY;


-- 
Samba Shared Repository