diff options
| author | Jeremy Allison <jra@samba.org> | 2003-02-19 02:34:44 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-02-19 02:34:44 +0000 |
| commit | 96cafdd7c735338da0616e0ad638282095f4c4d7 (patch) | |
| tree | 433411a774423bbeeb69e035ce0bcd788f5619d8 /source3/smbd/posix_acls.c | |
| parent | 647d65e08be07c87393b10cd95bf569978fc2a42 (diff) | |
| download | samba-96cafdd7c735338da0616e0ad638282095f4c4d7.tar.gz samba-96cafdd7c735338da0616e0ad638282095f4c4d7.tar.bz2 samba-96cafdd7c735338da0616e0ad638282095f4c4d7.zip | |
Fix from Corny.Bondad@hp.com for missing if (setting_acls) on default
perms.
Jeremy.
(This used to be commit 793609cbc2f657b91a59aec4a3f403bf826c7156)
Diffstat (limited to 'source3/smbd/posix_acls.c')
| -rw-r--r-- | source3/smbd/posix_acls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 5069db8097..0c8b08e4d5 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); } |