Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eventually add write permission when setting extended attributes #212

Merged
merged 3 commits into from
Sep 26, 2021
Merged

Eventually add write permission when setting extended attributes #212

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6a72eb
Eventually add write permission when setting extended attributes
TomasKorbar Aug 23, 2021
d9d1916
Some minor cleanup.
WayneD Sep 26, 2021
61e415a
Simplify the code a bit
WayneD Sep 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions xattrs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ int set_xattr(const char *fname, const struct file_struct *file, const char *fna
{
rsync_xa_list *glst = rsync_xal_l.items;
item_list *lst;
int ndx;
int ndx, added_write_perm = 0;

if (dry_run)
return 1; /* FIXME: --dry-run needs to compute this value */
Expand Down Expand Up @@ -1084,10 +1084,23 @@ int set_xattr(const char *fname, const struct file_struct *file, const char *fna
}
#endif

/* If the target file lacks write permission, we try to add it
* temporarily so we can change the extended attributes. */
if (!am_root
#ifdef SUPPORT_LINKS
&& !S_ISLNK(sxp->st.st_mode)
#endif
&& access(fname, W_OK) < 0
&& do_chmod(fname, (sxp->st.st_mode & CHMOD_BITS) | S_IWUSR) == 0)
added_write_perm = 1;

ndx = F_XATTR(file);
glst += ndx;
lst = &glst->xa_items;
return rsync_xal_set(fname, lst, fnamecmp, sxp);
int return_value = rsync_xal_set(fname, lst, fnamecmp, sxp);
if (added_write_perm) /* remove the temporary write permission */
do_chmod(fname, sxp->st.st_mode);
return return_value;
}

#ifdef SUPPORT_ACLS
Expand Down