-
- datum_size = sys_lgetxattr(fname, name, NULL, 0);
-@@ -315,6 +325,12 @@ void receive_xattr(struct file_struct *f
- memmove(ptr, ptr + UPRE_LEN, rxa->name_len);
+ rxas->name = ptr + datum_len;
+ rxas->datum = ptr;
+@@ -299,10 +315,8 @@ void receive_xattr(struct file_struct *f
+ size_t name_len = read_int(f);
+ size_t datum_len = read_int(f);
+ size_t extra_len = am_root < 0 ? RPRE_LEN : 0;
+-#ifndef HAVE_LINUX_XATTRS
+ if (datum_len + extra_len < datum_len)
+ out_of_memory("receive_xattr"); /* overflow */
+-#endif
+ if (name_len + datum_len + extra_len < name_len)
+ out_of_memory("receive_xattr"); /* overflow */
+ ptr = new_array(char, name_len + datum_len + extra_len);
+@@ -313,6 +327,10 @@ void receive_xattr(struct file_struct *f
+ read_buf(f, ptr, datum_len);
+ #ifdef HAVE_LINUX_XATTRS
+ /* Non-root can only save the user namespace. */
++ if (am_root < 0 && !HAS_PREFIX(name, USER_PREFIX)) {
++ name -= RPRE_LEN;
++ memcpy(name, RSYNC_PREFIX, RPRE_LEN);
++ } else
+ if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) {
+ free(ptr);
+ continue;
+@@ -333,6 +351,11 @@ void receive_xattr(struct file_struct *f
+ continue;