49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
--- rsync/generator.c
|
|
+++ rsync/generator.c
|
|
@@ -551,9 +551,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
|
|
#ifdef SUPPORT_XATTRS
|
|
if (preserve_xattrs && do_xfers
|
|
&& iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) {
|
|
- int fd = iflags & ITEM_REPORT_XATTR
|
|
- && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))
|
|
- ? sock_f_out : -1;
|
|
+ int fd = iflags & ITEM_REPORT_XATTR ? sock_f_out : -1;
|
|
send_xattr_request(NULL, file, fd);
|
|
}
|
|
#endif
|
|
|
|
--- rsync/receiver.c
|
|
+++ rsync/receiver.c
|
|
@@ -580,16 +580,14 @@ int recv_files(int f_in, int f_out, char *local_name)
|
|
rprintf(FINFO, "recv_files(%s)\n", fname);
|
|
|
|
#ifdef SUPPORT_XATTRS
|
|
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
|
|
- && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
|
|
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
|
|
recv_xattr_request(file, f_in);
|
|
#endif
|
|
|
|
if (!(iflags & ITEM_TRANSFER)) {
|
|
maybe_log_item(file, iflags, itemizing, xname);
|
|
#ifdef SUPPORT_XATTRS
|
|
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
|
|
- && !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))
|
|
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
|
|
set_file_attrs(fname, file, NULL, fname, 0);
|
|
#endif
|
|
if (iflags & ITEM_IS_NEW) {
|
|
|
|
--- rsync/sender.c
|
|
+++ rsync/sender.c
|
|
@@ -177,8 +177,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
|
|
if (iflags & ITEM_XNAME_FOLLOWS)
|
|
write_vstring(f_out, buf, len);
|
|
#ifdef SUPPORT_XATTRS
|
|
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
|
|
- && (protocol_version < 31 || !BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
|
|
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
|
|
send_xattr_request(fname, file, f_out);
|
|
#endif
|
|
}
|