Make sure that any weird mode bits (if they exist up beyond the

[rsync/rsync-patches.git] / fake-super.diff

diff --git a/fake-super.diff b/fake-super.diff
index f64f1d0..a5d1c5b 100644 (file)
--- a/fake-super.diff
+++ b/fake-super.diff
@@ -478,19 +478,7 @@ above:
                rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
                rxas->name = ptr + datum_len;
                rxas->datum = ptr;
-@@ -263,7 +279,10 @@ void send_xattr(statx *sxp, int f)
- #else
-                       /* We strip the rsync prefix from disguised namespaces
-                        * and put everything else in the user namespace. */
--                      if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)) {
-+                      if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
-+                       && (am_root < 0 || rxa->name_len != XSTAT_LEN + 1
-+                        || rxa->name[CENT_POS] != '%'
-+                        || strcmp(rxa->name, XSTAT_ATTR) != 0)) {
-                               write_int(f, rxa->name_len - RPRE_LEN);
-                               write_int(f, rxa->datum_len);
-                               write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
-@@ -298,10 +317,8 @@ void receive_xattr(struct file_struct *f
+@@ -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;
@@ -501,7 +489,7 @@ above:
                        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);
-@@ -312,6 +329,10 @@ void receive_xattr(struct file_struct *f
+@@ -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. */
@@ -512,7 +500,7 @@ above:
                        if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) {
                                free(ptr);
                                continue;
-@@ -332,6 +353,11 @@ void receive_xattr(struct file_struct *f
+@@ -333,6 +351,11 @@ void receive_xattr(struct file_struct *f
                                continue;
                        }
  #endif
@@ -524,7 +512,7 @@ above:
                        rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
                        rxa->name = name;
                        rxa->datum = ptr;
-@@ -411,4 +437,146 @@ int set_xattr(const char *fname, const s
+@@ -412,4 +435,149 @@ 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! */
  }
  
@@ -584,7 +572,7 @@ above:
 +{
 +      STRUCT_STAT fst, xst;
 +      dev_t rdev;
-+      mode_t mode;
++      mode_t mode, fmode;
 +
 +      if (dry_run)
 +              return 0;
@@ -601,20 +589,23 @@ above:
 +              return -1;
 +      }
 +
-+      if (IS_DEVICE(file->mode) || IS_SPECIAL(file->mode))
++      fst.st_mode &= (_S_IFMT | CHMOD_BITS);
++      fmode = file->mode & (_S_IFMT | CHMOD_BITS);
++
++      if (IS_DEVICE(fmode) || IS_SPECIAL(fmode))
 +              rdev = file->u.rdev;
 +      else
 +              rdev = 0;
 +
 +      /* Dump the special permissions and enable full owner access. */
-+      mode = (fst.st_mode & ~CHMOD_BITS) | (file->mode & ACCESSPERMS)
++      mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
 +           | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
 +      if (fst.st_mode != mode)
 +              do_chmod(fname, mode);
 +      if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode))
 +              fst.st_rdev = 0; /* just in case */
 +
-+      if (mode == file->mode && fst.st_rdev == rdev
++      if (mode == fmode && 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, XSTAT_ATTR) < 0) {
@@ -626,11 +617,11 @@ above:
 +              return 0;
 +      }
 +
-+      if (xst.st_mode != file->mode || xst.st_rdev != rdev
++      if (xst.st_mode != fmode || xst.st_rdev != rdev
 +       || xst.st_uid != file->uid || xst.st_gid != file->gid) {
 +              char buf[256];
 +              int len = snprintf(buf, sizeof buf, "%o %u,%u %u:%u",
-+                      to_wire_mode(file->mode) & (_S_IFMT|CHMOD_BITS),
++                      to_wire_mode(fmode),
 +                      (int)major(rdev), (int)minor(rdev),
 +                      (int)file->uid, (int)file->gid);
 +              if (sys_lsetxattr(fname, XSTAT_ATTR, buf, len) < 0) {