s3: smbd: POSIX ACLs. Remove incorrect check for SECINFO_PROTECTED_DACL in incoming...

Tidy-up of code obsoleted by fixes for bug #10773 (SECINFO_PROTECTED_DACL is not ignored).
We now never pass SECINFO_PROTECTED_DACL in security_information flags to this layer.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10773

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Aug 22 11:26:57 CEST 2014 on sn-devel-104

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index a49a5490456cbac69f17cd5c77a9f3449b7de70d..5364f1c8b3fbd33db9a70d987d21a09ac6e9e346 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3287,11 +3287,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
                num_profile_acls = 3;
        }
 
-       /*
-        * TODO: is this logic with SECINFO_PROTECTED_DACL, correct?
-        * See bug #10773.
-        */
-       if ((security_info & SECINFO_DACL) && !(security_info & SECINFO_PROTECTED_DACL)) {
+       if (security_info & SECINFO_DACL) {
 
                /*
                 * In the optimum case Creator Owner and Creator Group would be used for