/* These are to make syscall.o shut up. */
int dry_run = 0;
-+int am_root = 0; /* TODO: add option to set this to -1. */
++int am_root = 0;
int read_only = 1;
int list_only = 0;
int preserve_perms = 0;
int preserve_perms = 0;
--- old/xattr.c
+++ new/xattr.c
-@@ -28,11 +28,14 @@
- extern int dry_run;
- extern int read_only;
- extern int list_only;
-+extern int am_root;
- extern unsigned int file_struct_len;
+@@ -39,13 +39,23 @@ extern unsigned int file_struct_len;
+ #define SYSTEM_PREFIX "system."
+ #define SPRE_LEN ((int)sizeof SYSTEM_PREFIX - 1)
- #define RSYNC_XAL_INITIAL 5
- #define RSYNC_XAL_LIST_INITIAL 100
++#define RSYNC_PREFIX "rsync."
++#define XSTAT_SUFFIX "%stat"
++
+ #ifdef HAVE_LINUX_XATTRS
+ #define RPRE_LEN 0
++#define FAKE_PREFIX USER_PREFIX RSYNC_PREFIX
++#define FPRE_LEN ((int)sizeof FAKE_PREFIX - 1)
++#define XSTAT_ATTR USER_PREFIX RSYNC_PREFIX XSTAT_SUFFIX
+ #else
+-#define RSYNC_PREFIX "rsync."
+ #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
++#define FPRE_LEN 0
++#define XSTAT_ATTR RSYNC_PREFIX XSTAT_SUFFIX
+ #endif
-+#define FAKE_XATTR "user.rsync%stat"
++#define XSTAT_LEN ((int)sizeof XSTAT_ATTR - 1)
++#define CENT_POS (UPRE_LEN + (int)sizeof RSYNC_PREFIX - 1)
+
typedef struct {
- char *name;
- char *datum;
-@@ -132,9 +135,15 @@ static int rsync_xal_get(const char *fna
- if (name_size == 0)
- return 0;
- for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
-- rsync_xa *rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
-+ rsync_xa *rxas;
+ char *datum, *name;
+ size_t datum_len, name_len;
+@@ -143,6 +153,10 @@ static int rsync_xal_get(const char *fna
+ continue;
+ #endif
- len = strlen(name) + 1;
-+ if (am_root < 0 && len == sizeof FAKE_XATTR
-+ && name[10] == '%' && strcmp(name, FAKE_XATTR) == 0)
++ if (am_root < 0 && name_len == XSTAT_LEN
++ && name[CENT_POS] == '%' && strcmp(name, XSTAT_ATTR) == 0)
+ continue;
+
-+ rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
-+
- datum_size = sys_lgetxattr(fname, name, NULL, 0);
- if (datum_size < 0) {
+ datum_len = sys_lgetxattr(fname, name, NULL, 0);
+ if (datum_len < 0) {
if (errno == ENOTSUP)
-@@ -287,10 +296,19 @@ void receive_xattr(struct file_struct *f
+@@ -173,6 +187,13 @@ static int rsync_xal_get(const char *fna
+ return -1;
+ }
+ }
++#ifdef HAVE_LINUX_XATTRS
++ if (am_root < 0 && name_len > FPRE_LEN
++ && strncmp(name, FAKE_PREFIX, FPRE_LEN) == 0) {
++ name += FPRE_LEN;
++ name_len -= FPRE_LEN;
++ }
++#endif
+ rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
+ rxas->name = ptr + datum_len;
+ memcpy(rxas->name, name, name_len);
+@@ -293,20 +314,23 @@ void receive_xattr(struct file_struct *f
+ rsync_xa *rxa;
+ size_t name_len = read_int(f);
+ size_t datum_len = read_int(f);
++ size_t extra_len = am_root < 0 ? FPRE_LEN + RPRE_LEN : RPRE_LEN;
+ if (name_len + datum_len < name_len)
+ out_of_memory("receive_xattr"); /* overflow */
+-#ifndef HAVE_LINUX_XATTRS
+- if (name_len + datum_len + RPRE_LEN < RPRE_LEN)
++ if (name_len + datum_len + extra_len < extra_len)
+ out_of_memory("receive_xattr"); /* overflow */
+-#endif
+- ptr = new_array(char, name_len + datum_len + RPRE_LEN);
++ ptr = new_array(char, name_len + datum_len + extra_len);
+ if (!ptr)
out_of_memory("receive_xattr");
- read_buf(f, ptr, name_len);
- read_buf(f, ptr + name_len, datum_len);
-+
-+ if (am_root < 0 && name_len == sizeof FAKE_XATTR
-+ && ptr[10] == '%' && strcmp(ptr, FAKE_XATTR) == 0) {
+- name = ptr + datum_len + RPRE_LEN;
++ name = ptr + datum_len + extra_len;
+ read_buf(f, name, name_len);
+ read_buf(f, ptr, datum_len);
+ #ifdef HAVE_LINUX_XATTRS
+ /* Non-root can only save the user namespace. */
++ if (am_root < 0 && strncmp(name, USER_PREFIX, UPRE_LEN) != 0) {
++ name -= FPRE_LEN;
++ memcpy(name, FAKE_PREFIX, FPRE_LEN);
++ } else
+ if (!am_root && strncmp(name, USER_PREFIX, UPRE_LEN) != 0) {
+ free(ptr);
+ continue;
+@@ -323,6 +347,11 @@ void receive_xattr(struct file_struct *f
+ memcpy(name, RSYNC_PREFIX, RPRE_LEN);
+ }
+ #endif
++ if (am_root < 0 && name_len == XSTAT_LEN
++ && name[CENT_POS] == '%' && strcmp(name, XSTAT_ATTR) == 0) {
+ free(ptr);
-+ temp_xattr.count--;
+ continue;
+ }
-+
+ rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
+ rxa->name = name;
rxa->name_len = name_len;
- rxa->datum_len = datum_len;
- rxa->name = ptr;
- rxa->datum = ptr + name_len;
-+
- #ifdef HAVE_OSX_XATTRS
- if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
- rxa->name_len -= UPRE_LEN;
-@@ -372,4 +390,146 @@ int set_xattr(const char *fname, const s
+@@ -403,4 +432,146 @@ int set_xattr(const char *fname, const s
return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
}
+ xst = fst;
+ if (fname) {
+ fd = -1;
-+ len = sys_lgetxattr(fname, FAKE_XATTR, buf, sizeof buf - 1);
++ len = sys_lgetxattr(fname, XSTAT_ATTR, buf, sizeof buf - 1);
+ } else {
+ fname = "fd";
-+ len = sys_fgetxattr(fd, FAKE_XATTR, buf, sizeof buf - 1);
++ len = sys_fgetxattr(fd, XSTAT_ATTR, buf, sizeof buf - 1);
+ }
+ if (len >= (int)sizeof buf) {
+ len = -1;
+ return 0;
+ }
+ rsyserr(FERROR, errno, "failed to read xattr %s for %s",
-+ FAKE_XATTR, full_fname(fname));
++ XSTAT_ATTR, full_fname(fname));
+ return -1;
+ }
+ buf[len] = '\0';
+ if (sscanf(buf, "%o %d,%d %d:%d",
+ &mode, &rdev_major, &rdev_minor, &uid, &gid) != 5) {
+ rprintf(FERROR, "Corrupt %s xattr attached to %s: \"%s\"\n",
-+ FAKE_XATTR, full_fname(fname), buf);
++ XSTAT_ATTR, full_fname(fname), buf);
+ exit_cleanup(RERR_FILEIO);
+ }
+
+
+ if (read_only || list_only) {
+ rsyserr(FERROR, EROFS, "failed to write xattr %s for %s",
-+ FAKE_XATTR, full_fname(fname));
++ XSTAT_ATTR, full_fname(fname));
+ return -1;
+ }
+
+ if (mode == file->mode && fst.st_rdev == rdev
+ && fst.st_uid == file->uid && fst.st_gid == file->gid) {
+ /* xst.st_mode will be 0 if there's no current stat xattr */
-+ if (xst.st_mode && sys_lremovexattr(fname, FAKE_XATTR) < 0) {
++ if (xst.st_mode && sys_lremovexattr(fname, XSTAT_ATTR) < 0) {
+ rsyserr(FERROR, errno,
+ "delete of stat xattr failed for %s",
+ full_fname(fname));
+ to_wire_mode(file->mode) & (_S_IFMT|CHMOD_BITS),
+ (int)major(rdev), (int)minor(rdev),
+ (int)file->uid, (int)file->gid);
-+ if (sys_lsetxattr(fname, FAKE_XATTR, buf, len, 0) < 0) {
++ if (sys_lsetxattr(fname, XSTAT_ATTR, buf, len) < 0) {
+ if (errno == EPERM && S_ISLNK(fst.st_mode))
+ return 0;
+ rsyserr(FERROR, errno,
+ "failed to write xattr %s for %s",
-+ FAKE_XATTR, full_fname(fname));
++ XSTAT_ATTR, full_fname(fname));
+ return -1;
+ }
+ }