[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-32-146-g04fc826
Jeremy Allison
jra at samba.org
Fri Feb 6 03:49:40 GMT 2009
The branch, v3-0-test has been updated
via 04fc826efb290ba4b1f173752efb37a4b87281f2 (commit)
from df341bd2b83cc67e31d5b91ae39b4f4f7619ffd0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit 04fc826efb290ba4b1f173752efb37a4b87281f2
Author: Günter Kukkukk <linux at kukkukk.com>
Date: Thu Feb 5 19:48:58 2009 -0800
Don't try and delete a default ACL from a file.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/posix_acls.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 2fd047b..5f1c2d9 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3958,10 +3958,14 @@ BOOL set_unix_posix_default_acl(connection_struct *conn, const char *fname, SMB_
{
SMB_ACL_T def_acl = NULL;
- if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
- DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
- errno = EISDIR;
- return False;
+ if (!S_ISDIR(psbuf->st_mode)) {
+ if (num_def_acls) {
+ DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+ errno = EISDIR;
+ return false;
+ } else {
+ return true;
+ }
}
if (!num_def_acls) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list