[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  129bc58 smbd: Fix "map acl inherit" = yes
      from  3fe1f06 talloc/wscript: avoid passing pointless enabled=True to SAMBA_PYTHON()

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


- Log -----------------------------------------------------------------
commit 129bc58eee4b1868b1aaec6194808752520517b4
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Feb 1 14:41:43 2017 +0000

    smbd: Fix "map acl inherit" = yes
    
    Brown-Paper-Bag bug in f85c2a6852a. The assignment contains a self-reference
    in get_pai_flags which I missed.
    
    Fix an uninitialized read.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=12551
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Feb  1 22:06:50 CET 2017 on sn-devel-144

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

Summary of changes:
 source3/smbd/posix_acls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9d02e8a..c8d2bb3 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2699,9 +2699,9 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn,
 			.attr = ALLOW_ACE,
 			.trustee = sid,
 			.unix_ug = unix_ug,
-			.owner_type = owner_type,
-			.ace_flags = get_pai_flags(pal, ace, is_default_acl)
+			.owner_type = owner_type
 		};
+		ace->ace_flags = get_pai_flags(pal, ace, is_default_acl);
 
 		DLIST_ADD(l_head, ace);
 	}


-- 
Samba Shared Repository