summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-02-19 02:34:33 +0000
committerJeremy Allison <jra@samba.org>2003-02-19 02:34:33 +0000
commitb63edf9a28cf81536d45fbbe8021683262ff07a2 (patch)
tree2e980632a7e4b5830decd04baf48da13ed4e25e2
parente7b5d059c2af0ffb71e3d6b12a35a1dcd3295942 (diff)
downloadsamba-b63edf9a28cf81536d45fbbe8021683262ff07a2.tar.gz
samba-b63edf9a28cf81536d45fbbe8021683262ff07a2.tar.bz2
samba-b63edf9a28cf81536d45fbbe8021683262ff07a2.zip
Fix from Corny.Bondad@hp.com for missing if (setting_acls) on default
perms. Jeremy. (This used to be commit ac96fa173cc3bd1c3226634154d6f99e4034179f)
-rw-r--r--source3/smbd/posix_acls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 2739f73b0a..a40fb4042f 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -699,11 +699,11 @@ static BOOL ensure_canon_entry_valid(canon_ace **pp_ace,
pace->unix_ug.world = -1;
pace->trustee = global_sid_World;
pace->attr = ALLOW_ACE;
- if (setting_acl)
+ if (setting_acl) {
pace->perms = 0;
- else
+ apply_default_perms(fsp, pace, S_IROTH);
+ } else
pace->perms = unix_perms_to_acl_perms(pst->st_mode, S_IROTH, S_IWOTH, S_IXOTH);
- apply_default_perms(fsp, pace, S_IROTH);
DLIST_ADD(*pp_ace, pace);
}