diff options
| author | Jeremy Allison <jra@samba.org> | 2018-03-15 09:54:41 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-03-22 22:03:26 +0100 |
| commit | 85553b7e6f5516108de61ba606f9b8267d14d540 (patch) | |
| tree | f65c7bc99a020a80ef4031a5671345e026667474 /source3/modules | |
| parent | bf3e90462b8c1172ada2a8346db376984dd54394 (diff) | |
| download | samba-85553b7e6f5516108de61ba606f9b8267d14d540.tar.gz | |
s3: smbd: vfs_fruit: Replace code in check_ms_nfs() with remove_virtual_nfs_aces().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13319
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit a3c925d80433e3d4fe1b1b315edf6520cacf0a9e)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_fruit.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index f63d53b9a99..b2ff8f434b5 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -2988,9 +2988,6 @@ static NTSTATUS check_ms_nfs(vfs_handle_struct *handle, { uint32_t i; struct fruit_config_data *config = NULL; - struct dom_sid sid; - NTSTATUS status = NT_STATUS_OK; - bool remove_ok = false; *pdo_chmod = false; @@ -3024,40 +3021,7 @@ static NTSTATUS check_ms_nfs(vfs_handle_struct *handle, * fruit_fget_nt_acl(). */ - /* MS NFS style mode */ - sid_compose(&sid, &global_sid_Unix_NFS_Mode, - fsp->fsp_name->st.st_ex_mode); - status = security_descriptor_dacl_del(psd, &sid); - remove_ok = (NT_STATUS_IS_OK(status) || - NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)); - if (!remove_ok) { - DBG_WARNING("failed to remove MS NFS_mode style ACE\n"); - return status; - } - - /* MS NFS style uid */ - sid_compose(&sid, &global_sid_Unix_NFS_Users, - fsp->fsp_name->st.st_ex_uid); - status = security_descriptor_dacl_del(psd, &sid); - remove_ok = (NT_STATUS_IS_OK(status) || - NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)); - if (!remove_ok) { - DBG_WARNING("failed to remove MS NFS_users style ACE\n"); - return status; - } - - /* MS NFS style gid */ - sid_compose(&sid, &global_sid_Unix_NFS_Groups, - fsp->fsp_name->st.st_ex_gid); - status = security_descriptor_dacl_del(psd, &sid); - remove_ok = (NT_STATUS_IS_OK(status) || - NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)); - if (!remove_ok) { - DBG_WARNING("failed to remove MS NFS_groups style ACE\n"); - return status; - } - - return NT_STATUS_OK; + return remove_virtual_nfs_aces(psd); } /**************************************************************************** |