s3: modules: vfs_ceph: Remove CHMOD_ACL in cephwrap_chmod().
authorJeremy Allison <jra@samba.org>
Thu, 17 May 2018 18:19:33 +0000 (11:19 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 25 May 2018 16:39:24 +0000 (18:39 +0200)
Now I understand the use of the mask in POSIX ACLs
this extra step is no longer needed.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/modules/vfs_ceph.c

index f3b651b894e023493ab7d3c36f91da01a63888b8..818d0cb54908afd817193da502e25b72c6e0486c 100644 (file)
@@ -946,26 +946,6 @@ static int cephwrap_chmod(struct vfs_handle_struct *handle,
        int result;
 
        DBG_DEBUG("[CEPH] chmod(%p, %s, %d)\n", handle, smb_fname->base_name, mode);
-
-       /*
-        * We need to do this due to the fact that the default POSIX ACL
-        * chmod modifies the ACL *mask* for the group owner, not the
-        * group owner bits directly. JRA.
-        */
-
-
-       {
-               int saved_errno = errno; /* We might get ENOSYS */
-               result = SMB_VFS_CHMOD_ACL(handle->conn,
-                                       smb_fname,
-                                       mode);
-               if (result == 0) {
-                       return result;
-               }
-               /* Error - return the old errno. */
-               errno = saved_errno;
-       }
-
        result = ceph_chmod(handle->data, smb_fname->base_name, mode);
        DBG_DEBUG("[CEPH] chmod(...) = %d\n", result);
        WRAP_RETURN(result);