[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-513-ge4ad0a1
Jeremy Allison
jra at samba.org
Fri Feb 6 02:58:38 GMT 2009
The branch, master has been updated
via e4ad0a1d1f3235405d42bc58b6bdb3c7d04e8486 (commit)
from 16d2fdf5750dbb344b19df23fb741fc8e0b43d10 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e4ad0a1d1f3235405d42bc58b6bdb3c7d04e8486
Author: Günter Kukkukk <linux at kukkukk.com>
Date: Thu Feb 5 18:57:41 2009 -0800
Don't try and delete a default ACL from a file.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/posix_acls.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 7ea6e39..e9b581e 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -4209,10 +4209,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