diff options
| author | Jeremy Allison <jra@samba.org> | 2014-08-21 16:28:42 -0700 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-08-22 11:26:57 +0200 |
| commit | 815bde28eeb698904d38c351f67ad1b58aa5a2cc (patch) | |
| tree | 657b1132bc99d8345c3447419be1f8d7d3ff9c97 /source3/smbd/posix_acls.c | |
| parent | 8d96a280f6174b54fe2674be6065c5b16f7ec04d (diff) | |
| download | samba-815bde28eeb698904d38c351f67ad1b58aa5a2cc.tar.gz | |
s3: smbd: POSIX ACLs. Remove incorrect check for SECINFO_PROTECTED_DACL in incoming security_information flags in posix_get_nt_acl_common().
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
Diffstat (limited to 'source3/smbd/posix_acls.c')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index b71fd895374..126b822439a 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -3280,11 +3280,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 |