[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Jun 7 02:19:51 MDT 2010
The branch, master has been updated
via f769671... Fix bug with incorrect flag values for inherited ace in some cases.
from 98b98a2... s4:password_hash LDB module - adapt the module to the new "ldb_msg_remove_attr" behaviour
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f7696717800e82193e2b1ab1b3467e117306a769
Author: Matthew McGillis <matthew at mcgillis.org>
Date: Fri Jun 4 17:48:40 2010 -0700
Fix bug with incorrect flag values for inherited ace in some cases.
-----------------------------------------------------------------------
Summary of changes:
source3/utils/smbcacls.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 0c7a722..46361ad 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1026,6 +1026,9 @@ static int inherit(struct cli_state *cli, const char *filename,
parent = get_secdesc(cli,parentname);
for (i=0;i<parent->dacl->num_aces;i++) {
struct security_ace *ace=&parent->dacl->aces[i];
+ /* Add inherited flag to all aces */
+ ace->flags=ace->flags|
+ SEC_ACE_FLAG_INHERITED_ACE;
if ((oldattr & aDIR) == aDIR) {
if ((ace->flags & SEC_ACE_FLAG_CONTAINER_INHERIT) ==
SEC_ACE_FLAG_CONTAINER_INHERIT) {
@@ -1034,6 +1037,8 @@ static int inherit(struct cli_state *cli, const char *filename,
} else {
if ((ace->flags & SEC_ACE_FLAG_OBJECT_INHERIT) ==
SEC_ACE_FLAG_OBJECT_INHERIT) {
+ /* clear flags for files */
+ ace->flags=0;
add_ace(&old->dacl, ace);
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list