The branch, master has been updated
via 815bde2 s3: smbd: POSIX ACLs. Remove incorrect check for
SECINFO_PROTECTED_DACL in incoming security_information flags in
posix_get_nt_acl_common().
from 8d96a28 messaging_dgm: Factor out messaging_dgm_lockfile_name
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 815bde28eeb698904d38c351f67ad1b58aa5a2cc
Author: Jeremy Allison <[email protected]>
Date: Thu Aug 21 16:28:42 2014 -0700
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 <[email protected]>
Reviewed-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Fri Aug 22 11:26:57 CEST 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/posix_acls.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index b71fd89..126b822 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
--
Samba Shared Repository
