The branch, v3-2-test has been updated
via ef2913a66c3888d4813d8b778ddd63b2c7e48f3e (commit)
via 58cfa4b1bdc1ce30cc3befb342cc98ac0e283585 (commit)
from d4a9e46edf7336f673c001c559af96eb0ecf9f6f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit ef2913a66c3888d4813d8b778ddd63b2c7e48f3e
Merge: 58cfa4b1bdc1ce30cc3befb342cc98ac0e283585
d4a9e46edf7336f673c001c559af96eb0ecf9f6f
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Jan 24 16:16:40 2008 -0800
Merge branch 'v3-2-test' of ssh://[EMAIL PROTECTED]/data/git/samba into
v3-2-test
commit 58cfa4b1bdc1ce30cc3befb342cc98ac0e283585
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Jan 24 16:13:53 2008 -0800
Make explicit in debug we're ignoring flags from the parent SD.
Jeremy
-----------------------------------------------------------------------
Summary of changes:
source/smbd/posix_acls.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index dee5d8e..12e611f 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3299,9 +3299,10 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
/* Doesn't apply to a directory - ignore. */
DEBUG(10,("append_parent_acl: directory %s "
"ignoring non container "
- "inherit flags %u\n",
+ "inherit flags %u from parent %s\n",
fsp->fsp_name,
- (unsigned int)se->flags ));
+ (unsigned int)se->flags,
+ parent_name));
continue;
}
} else {
@@ -3309,9 +3310,10 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
/* Doesn't apply to a file - ignore. */
DEBUG(10,("append_parent_acl: file %s "
"ignoring non object "
- "inherit flags %u\n",
+ "inherit flags %u from parent %s\n",
fsp->fsp_name,
- (unsigned int)se->flags ));
+ (unsigned int)se->flags,
+ parent_name));
continue;
}
}
@@ -3330,9 +3332,11 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
if (k < psd->dacl->num_aces) {
/* SID matched. Ignore. */
DEBUG(10,("append_parent_acl: path %s "
- "ignoring protected sid %s\n",
+ "ignoring protected sid %s "
+ "from parent %s\n",
fsp->fsp_name,
- sid_string_dbg(&se->trustee)));
+ sid_string_dbg(&se->trustee),
+ parent_name));
continue;
}
}
--
Samba Shared Repository
