Attachment 9236 Details for Bug 10163 – Patch

[patch] Patch

rsync.patch (text/plain), 1.07 KB, created by Michal Luscon (mail bounces back) on 2013-09-23 10:23:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Luscon (mail bounces back)

Created: 2013-09-23 10:23:41 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/rsync.c b/rsync.c
>index c315a45b..5a0f782c 100644
>--- a/rsync.c
>+++ b/rsync.c
>@@ -419,13 +419,6 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
> 		get_acl(fname, sxp);
> #endif
> 
>-#ifdef SUPPORT_XATTRS
>-	if (am_root < 0)
>-		set_stat_xattr(fname, file, new_mode);
>-	if (preserve_xattrs && fnamecmp)
>-		set_xattr(fname, file, fnamecmp, sxp);
>-#endif
>-
> 	if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
> 		flags |= ATTRS_SKIP_MTIME;
> 	if (!(flags & ATTRS_SKIP_MTIME)
>@@ -485,6 +478,15 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
> 		updated = 1;
> 	}
> 
>+#ifdef SUPPORT_XATTRS
>+    /* This must come after calling chown(2), since that removes security
>+       attributes (capabilities(5)). */
>+	if (am_root < 0)
>+		set_stat_xattr(fname, file, new_mode);
>+	if (preserve_xattrs && fnamecmp)
>+		set_xattr(fname, file, fnamecmp, sxp);
>+#endif
>+
> #ifdef SUPPORT_ACLS
> 	/* It's OK to call set_acl() now, even for a dir, as the generator
> 	 * will enable owner-writability using chmod, if necessary.

Actions: View

Attachments on bug 10163: 9236 | 9492