[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  7fd926f Make sure that we only propogate the INHERITED flag when we are allowed to.
      from  ffe14d9 Optimization suggested by Volker. Don't do a stat system call on normal read path.

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


- Log -----------------------------------------------------------------
commit 7fd926fcdcb92a8e1e2b0c29371f2eb2ae4057df
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date:   Wed Mar 27 19:36:43 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>
    Reviewed-by: Richard Sharpe <realrichardsharpe at gmail.com>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Mar 28 19:43:41 CET 2013 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/libcli/security/secdesc.c b/libcli/security/secdesc.c
index d2c5833..a7e9900 100644
--- a/libcli/security/secdesc.c
+++ b/libcli/security/secdesc.c
@@ -614,7 +614,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