Skip to content

Commit

Permalink
acls: sync type for orig_umask
Browse files Browse the repository at this point in the history
When sizeof(mode_t) != sizeof(int) it will result in unintentional
reads of global memory.

While at it, silence again a warning that is being triggered by
Apple's clang 15.
  • Loading branch information
carenas committed May 19, 2024
1 parent 4592aa7 commit 3bf7d17
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions acls.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern int dry_run;
extern int am_root;
extern int read_only;
extern int list_only;
extern int orig_umask;
extern mode_t orig_umask;
extern int numeric_ids;
extern int inc_recurse;
extern int preserve_devices;
Expand Down Expand Up @@ -982,7 +982,7 @@ static int set_rsync_acl(const char *fname, acl_duo *duo_item,
&& !pack_smb_acl(&duo_item->sacl, &duo_item->racl))
return -1;
#ifdef HAVE_OSX_ACLS
mode = 0; /* eliminate compiler warning */
(void)mode; /* eliminate compiler warning */
#else
if (type == SMB_ACL_TYPE_ACCESS) {
cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl, cur_mode, mode);
Expand Down

0 comments on commit 3bf7d17

Please sign in to comment.