]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Fix "map acl inherit" = yes
authorVolker Lendecke <vl@samba.org>
Wed, 1 Feb 2017 14:41:43 +0000 (14:41 +0000)
committerKarolin Seeger <kseeger@samba.org>
Tue, 7 Feb 2017 08:36:24 +0000 (09:36 +0100)
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@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Wed Feb  1 22:06:50 CET 2017 on sn-devel-144

(cherry picked from commit 129bc58eee4b1868b1aaec6194808752520517b4)

source3/smbd/posix_acls.c

index d87253df813fc069c9576640be88c5d673467179..e2a10cff7619546bd710a648a417308cbfcbe6cb 100644 (file)
@@ -2700,9 +2700,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);
        }