[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4910-g1d277bd
Jeremy Allison
jra at samba.org
Fri Feb 6 02:59:49 GMT 2009
The branch, v3-3-test has been updated
via 1d277bdb6997e3b913bcd1c0b3173c9c735e64c1 (commit)
from d998ee9025f2ad2df73e25c12e35e9218b97147e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 1d277bdb6997e3b913bcd1c0b3173c9c735e64c1
Author: Günter Kukkukk <linux at kukkukk.com>
Date: Thu Feb 5 18:59:03 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 b862699..00f7f1c 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -4045,10 +4045,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