A couple xattr fixes for --fake-super.

[rsync/rsync.git] / xattrs.c

diff --git a/xattrs.c b/xattrs.c
index 349fbf4..85341b3 100644 (file)
--- a/xattrs.c
+++ b/xattrs.c
@@ -44,9 +44,9 @@ extern int checksum_seed;
 
 #define XATTR_ABBREV(x) ((size_t)((x).name - (x).datum) < (x).datum_len)
 
-#define XSTATE_ABBREV  0
-#define XSTATE_DONE    1
-#define XSTATE_TODO    2
+#define XSTATE_ABBREV  1
+#define XSTATE_DONE    2
+#define XSTATE_TODO    3
 
 #define USER_PREFIX "user."
 #define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
@@ -294,7 +294,7 @@ int copy_xattrs(const char *source, const char *dest)
        size_t datum_len;
        char *name, *ptr;
 #ifdef HAVE_LINUX_XATTRS
-       int user_only = am_sender ? 0 : !am_root;
+       int user_only = am_sender ? 0 : am_root <= 0;
 #endif
 
        /* This puts the name list into the "namebuf" buffer. */
@@ -590,8 +590,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
                                who_am_i(), num, f_name(file, NULL));
                        exit_cleanup(RERR_STREAMIO);
                }
-               if (rxa->datum_len <= MAX_FULL_DATUM || rxa->datum[0] != XSTATE_ABBREV) {
-                       rprintf(FERROR, "[%s] internal abbrev error!\n", who_am_i());
+               if (!XATTR_ABBREV(*rxa) || rxa->datum[0] != XSTATE_ABBREV) {
+                       rprintf(FERROR, "[%s] internal abbrev error on %s (%s, len=%ld)!\n",
+                               who_am_i(), f_name(file, NULL), rxa->name, (long)rxa->datum_len);
                        exit_cleanup(RERR_STREAMIO);
                }
 
@@ -744,6 +745,9 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
        ssize_t list_len;
        size_t i, len;
        char *name, *ptr, sum[MAX_DIGEST_LEN];
+#ifdef HAVE_LINUX_XATTRS
+       int user_only = am_root <= 0;
+#endif
        size_t name_len;
        int ret = 0;
 
@@ -819,8 +823,8 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 #ifdef HAVE_LINUX_XATTRS
                /* We always ignore the system namespace, and non-root
                 * ignores everything but the user namespace. */
-               if (am_root ? HAS_PREFIX(name, SYSTEM_PREFIX)
-                           : !HAS_PREFIX(name, USER_PREFIX))
+               if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
+                             : HAS_PREFIX(name, SYSTEM_PREFIX))
                        continue;
 #endif
                if (am_root < 0 && name_len > RPRE_LEN