git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dcbeddb
)
Don't try and delete a default ACL from a file.
author
Günter Kukkukk
<linux@kukkukk.com>
Fri, 6 Feb 2009 03:48:58 +0000
(19:48 -0800)
committer
Karolin Seeger
<kseeger@samba.org>
Thu, 30 Jul 2009 07:22:11 +0000
(09:22 +0200)
(cherry picked from commit
04fc826efb290ba4b1f173752efb37a4b87281f2
)
source/smbd/posix_acls.c
patch
|
blob
|
history
diff --git
a/source/smbd/posix_acls.c
b/source/smbd/posix_acls.c
index ed38ffcae15bcf281e40a3a4836a970372f8da41..d679304d901e500663e4a40bc5ce897b34b31bff 100644
(file)
--- a/
source/smbd/posix_acls.c
+++ b/
source/smbd/posix_acls.c
@@
-3960,10
+3960,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) {