s3: posix_acls: Remove unused 'connection_struct *conn' parameter to map_acl_perms_to...
authorJeremy Allison <jra@samba.org>
Fri, 18 May 2018 18:37:22 +0000 (11:37 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 25 May 2018 16:39:25 +0000 (18:39 +0200)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/smbd/posix_acls.c

index 8c57e7a959ae91f9a232aec8e90109c906628325..ffe3416d20a3b43644db44b8235967cb9c430a70 100644 (file)
@@ -889,7 +889,7 @@ static mode_t unix_perms_to_acl_perms(mode_t mode, int r_mask, int w_mask, int x
  an SMB_ACL_PERMSET_T.
 ****************************************************************************/
 
-static int map_acl_perms_to_permset(connection_struct *conn, mode_t mode, SMB_ACL_PERMSET_T *p_permset)
+static int map_acl_perms_to_permset(mode_t mode, SMB_ACL_PERMSET_T *p_permset)
 {
        if (sys_acl_clear_perms(*p_permset) ==  -1)
                return -1;
@@ -2918,7 +2918,7 @@ static bool set_canon_ace_list(files_struct *fsp,
                        goto fail;
                }
 
-               if (map_acl_perms_to_permset(conn, p_ace->perms, &the_permset) == -1) {
+               if (map_acl_perms_to_permset(p_ace->perms, &the_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create permset for mode (%u) on entry %d. (%s)\n",
                                (unsigned int)p_ace->perms, i, strerror(errno) ));
                        goto fail;
@@ -2955,7 +2955,7 @@ static bool set_canon_ace_list(files_struct *fsp,
                        goto fail;
                }
 
-               if (map_acl_perms_to_permset(conn, S_IRUSR|S_IWUSR|S_IXUSR, &mask_permset) == -1) {
+               if (map_acl_perms_to_permset(S_IRUSR|S_IWUSR|S_IXUSR, &mask_permset) == -1) {
                        DEBUG(0,("set_canon_ace_list: Failed to create mask permset. (%s)\n", strerror(errno) ));
                        goto fail;
                }
@@ -4053,7 +4053,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo
                                continue;
                }
 
-               if (map_acl_perms_to_permset(conn, perms, &permset) == -1)
+               if (map_acl_perms_to_permset(perms, &permset) == -1)
                        return -1;
 
                if (sys_acl_set_permset(entry, permset) == -1)