Fix from Corny.Bondad@hp.com for missing if (setting_acls) on default

perms.
Jeremy.
(This used to be commit ac96fa173cc3bd1c3226634154d6f99e4034179f)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 2739f73b0ac30010edaced30d457e6b47a110100..a40fb4042f48f90589a22b89ffaefca4d0e05b92 100644 (file)
--- 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);
        }