X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16edf86595a5a990a942fa045dfb523dae1fe6cb..a685271de33c6d9d39fb1a8855fe214911c774e6:/xattrs.c

diff --git a/xattrs.c b/xattrs.c
index 793ebbfc..6ab9698b 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2006, 2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,11 +16,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
+#include "ifuncs.h"
 #include "lib/sysxattrs.h"
 
 #ifdef SUPPORT_XATTRS
@@ -30,6 +31,7 @@ extern int am_sender;
 extern int am_generator;
 extern int read_only;
 extern int list_only;
+extern int preserve_xattrs;
 extern int checksum_seed;
 
 #define RSYNC_XAL_INITIAL 5
@@ -53,11 +55,17 @@ extern int checksum_seed;
 #define SPRE_LEN ((int)sizeof SYSTEM_PREFIX - 1)
 
 #ifdef HAVE_LINUX_XATTRS
-#define RPRE_LEN 0
+#define MIGHT_NEED_RPRE (am_root < 0)
+#define RSYNC_PREFIX USER_PREFIX "rsync."
 #else
+#define MIGHT_NEED_RPRE am_root
 #define RSYNC_PREFIX "rsync."
-#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
 #endif
+#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
+
+#define XSTAT_ATTR RSYNC_PREFIX "%stat"
+#define XACC_ACL_ATTR RSYNC_PREFIX "%aacl"
+#define XDEF_ACL_ATTR RSYNC_PREFIX "%dacl"
 
 typedef struct {
 	char *datum, *name;
@@ -84,7 +92,7 @@ static void rsync_xal_free(item_list *xalp)
 	xalp->count = 0;
 }
 
-void free_xattr(statx *sxp)
+void free_xattr(stat_x *sxp)
 {
 	if (!sxp->xattr)
 		return;
@@ -124,7 +132,7 @@ static ssize_t get_xattr_names(const char *fname)
 	if (errno == ERANGE) {
 		list_len = sys_llistxattr(fname, NULL, 0);
 		if (list_len < 0) {
-			rsyserr(FERROR, errno,
+			rsyserr(FERROR_XFER, errno,
 				"get_xattr_names: llistxattr(\"%s\",0) failed",
 				fname);
 			return -1;
@@ -140,7 +148,7 @@ static ssize_t get_xattr_names(const char *fname)
 			return list_len;
 	}
 
-	rsyserr(FERROR, errno,
+	rsyserr(FERROR_XFER, errno,
 		"get_xattr_names: llistxattr(\"%s\",%ld) failed",
 		fname, (long)namebuf_len);
 	return -1;
@@ -153,32 +161,35 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
 			    int no_missing_error)
 {
 	size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
+	size_t extra_len = *len_ptr;
 	char *ptr;
 
+	*len_ptr = datum_len;
+
 	if (datum_len == (size_t)-1) {
 		if (errno == ENOTSUP || no_missing_error)
 			return NULL;
-		rsyserr(FERROR, errno,
+		rsyserr(FERROR_XFER, errno,
 			"get_xattr_data: lgetxattr(\"%s\",\"%s\",0) failed",
 			fname, name);
 		return NULL;
 	}
 
-	if (datum_len + *len_ptr < datum_len /* checks for overflow */
-	 || !(ptr = new_array(char, datum_len + *len_ptr)))
+	if (!datum_len && !extra_len)
+		extra_len = 1; /* request non-zero amount of memory */
+	if (datum_len + extra_len < datum_len /* checks for overflow */
+	 || !(ptr = new_array(char, datum_len + extra_len)))
 		out_of_memory("get_xattr_data");
 
-	*len_ptr = datum_len;
-
 	if (datum_len) {
 		size_t len = sys_lgetxattr(fname, name, ptr, datum_len);
 		if (len != datum_len) {
 			if (len == (size_t)-1) {
-				rsyserr(FERROR, errno,
+				rsyserr(FERROR_XFER, errno,
 				    "get_xattr_data: lgetxattr(\"%s\",\"%s\",%ld)"
 				    " failed", fname, name, (long)datum_len);
 			} else {
-				rprintf(FERROR,
+				rprintf(FERROR_XFER,
 				    "get_xattr_data: lgetxattr(\"%s\",\"%s\",%ld)"
 				    " returned %ld\n", fname, name,
 				    (long)datum_len, (long)len);
@@ -205,7 +216,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
 		return -1;
 
 	for (name = namebuf; list_len > 0; name += name_len) {
-		rsync_xa *rxas;
+		rsync_xa *rxa;
 
 		name_len = strlen(name) + 1;
 		list_len -= name_len;
@@ -218,6 +229,14 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
 			continue;
 #endif
 
+		/* No rsync.%FOO attributes are copied w/o 2 -X options. */
+		if (name_len > RPRE_LEN && name[RPRE_LEN] == '%'
+		 && HAS_PREFIX(name, RSYNC_PREFIX)) {
+			if ((am_sender && preserve_xattrs < 2)
+			 || (am_root < 0 && strcmp(name, XSTAT_ATTR) == 0))
+				continue;
+		}
+
 		datum_len = name_len; /* Pass extra size to get_xattr_data() */
 		if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
 			return -1;
@@ -236,12 +255,20 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
 		} else
 			name_offset = datum_len;
 
-		rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
-		rxas->name = ptr + name_offset;
-		memcpy(rxas->name, name, name_len);
-		rxas->datum = ptr;
-		rxas->name_len = name_len;
-		rxas->datum_len = datum_len;
+#ifdef HAVE_LINUX_XATTRS
+		if (am_root < 0 && name_len > RPRE_LEN && name[RPRE_LEN] != '%'
+		 && HAS_PREFIX(name, RSYNC_PREFIX)) {
+			name += RPRE_LEN;
+			name_len -= RPRE_LEN;
+		}
+#endif
+
+		rxa = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
+		rxa->name = ptr + name_offset;
+		memcpy(rxa->name, name, name_len);
+		rxa->datum = ptr;
+		rxa->name_len = name_len;
+		rxa->datum_len = datum_len;
 	}
 	if (xalp->count > 1)
 		qsort(xalp->items, xalp->count, sizeof (rsync_xa), rsync_xal_compare_names);
@@ -249,7 +276,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
 }
 
 /* Read the xattr(s) for this filename. */
-int get_xattr(const char *fname, statx *sxp)
+int get_xattr(const char *fname, stat_x *sxp)
 {
 	sxp->xattr = new(item_list);
 	*sxp->xattr = empty_xattr;
@@ -311,33 +338,33 @@ static void rsync_xal_store(item_list *xalp)
 }
 
 /* Send the make_xattr()-generated xattr list for this flist entry. */
-int send_xattr(statx *sxp, int f)
+int send_xattr(stat_x *sxp, int f)
 {
 	int ndx = find_matching_xattr(sxp->xattr);
 
 	/* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
-	write_abbrevint(f, ndx + 1);
+	write_varint(f, ndx + 1);
 
 	if (ndx < 0) {
 		rsync_xa *rxa;
 		int count = sxp->xattr->count;
-		write_abbrevint(f, count);
+		write_varint(f, count);
 		for (rxa = sxp->xattr->items; count--; rxa++) {
 #ifdef HAVE_LINUX_XATTRS
-			write_abbrevint(f, rxa->name_len);
-			write_abbrevint(f, rxa->datum_len);
+			write_varint(f, rxa->name_len);
+			write_varint(f, rxa->datum_len);
 			write_buf(f, rxa->name, rxa->name_len);
 #else
 			/* We strip the rsync prefix from disguised namespaces
 			 * and put everything else in the user namespace. */
 			if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
 			 && rxa->name[RPRE_LEN] != '%') {
-				write_abbrevint(f, rxa->name_len - RPRE_LEN);
-				write_abbrevint(f, rxa->datum_len);
+				write_varint(f, rxa->name_len - RPRE_LEN);
+				write_varint(f, rxa->datum_len);
 				write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
 			} else {
-				write_abbrevint(f, rxa->name_len + UPRE_LEN);
-				write_abbrevint(f, rxa->datum_len);
+				write_varint(f, rxa->name_len + UPRE_LEN);
+				write_varint(f, rxa->datum_len);
 				write_buf(f, USER_PREFIX, UPRE_LEN);
 				write_buf(f, rxa->name, rxa->name_len);
 			}
@@ -357,7 +384,7 @@ int send_xattr(statx *sxp, int f)
 /* Return a flag indicating if we need to change a file's xattrs.  If
  * "find_all" is specified, also mark any abbreviated xattrs that we
  * need so that send_xattr_request() can tell the sender about them. */
-int xattr_diff(struct file_struct *file, statx *sxp, int find_all)
+int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
 {
 	item_list *lst = rsync_xal_l.items;
 	rsync_xa *snd_rxa, *rec_rxa;
@@ -454,7 +481,7 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
 		/* Flag that we handled this abbreviated item. */
 		rxa->datum[0] = XSTATE_DONE;
 
-		write_abbrevint(f_out, j - prior_req);
+		write_varint(f_out, j - prior_req);
 		prior_req = j;
 
 		if (fname) {
@@ -462,10 +489,13 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
 			char *ptr;
 
 			/* Re-read the long datum. */
-			if (!(ptr = get_xattr_data(fname, rxa->name, &len, 0)))
+			if (!(ptr = get_xattr_data(fname, rxa->name, &len, 0))) {
+				rprintf(FERROR_XFER, "failed to re-read xattr %s for %s\n", rxa->name, fname);
+				write_varint(f_out, 0);
 				continue;
+			}
 
-			write_abbrevint(f_out, len); /* length might have changed! */
+			write_varint(f_out, len); /* length might have changed! */
 			write_buf(f_out, ptr, len);
 			free(ptr);
 		}
@@ -499,12 +529,12 @@ void xattr_clear_locals(struct file_struct *file)
  * any needed xattrs with a flag that lets us know they need to be sent to
  * the receiver.  When called by the receiver, reads the sent data and
  * stores it in place of its checksum. */
-void recv_xattr_request(struct file_struct *file, int f_in)
+int recv_xattr_request(struct file_struct *file, int f_in)
 {
 	item_list *lst = rsync_xal_l.items;
 	char *old_datum, *name;
 	rsync_xa *rxa;
-	int rel_pos, cnt;
+	int rel_pos, cnt, got_xattr_data = 0;
 
 	if (F_XATTR(file) < 0) {
 		rprintf(FERROR, "recv_xattr_request: internal data error!\n");
@@ -515,7 +545,7 @@ void recv_xattr_request(struct file_struct *file, int f_in)
 	cnt = lst->count;
 	rxa = lst->items;
 	rxa -= 1;
-	while ((rel_pos = read_abbrevint(f_in)) != 0) {
+	while ((rel_pos = read_varint(f_in)) != 0) {
 		rxa += rel_pos;
 		cnt -= rel_pos;
 		if (cnt < 0 || rxa->datum_len <= MAX_FULL_DATUM
@@ -530,7 +560,7 @@ void recv_xattr_request(struct file_struct *file, int f_in)
 		}
 
 		old_datum = rxa->datum;
-		rxa->datum_len = read_abbrevint(f_in);
+		rxa->datum_len = read_varint(f_in);
 
 		if (rxa->name_len + rxa->datum_len < rxa->name_len)
 			out_of_memory("recv_xattr_request"); /* overflow */
@@ -542,7 +572,10 @@ void recv_xattr_request(struct file_struct *file, int f_in)
 		rxa->name = name;
 		free(old_datum);
 		read_buf(f_in, rxa->datum, rxa->datum_len);
+		got_xattr_data = 1;
 	}
+
+	return got_xattr_data;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -552,7 +585,7 @@ void receive_xattr(struct file_struct *file, int f)
 {
 	static item_list temp_xattr = EMPTY_ITEM_LIST;
 	int count;
-	int ndx = read_abbrevint(f);
+	int ndx = read_varint(f);
 
 	if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
 		rprintf(FERROR, "receive_xattr: xa index %d out of"
@@ -565,7 +598,7 @@ void receive_xattr(struct file_struct *file, int f)
 		return;
 	}
 	
-	if ((count = read_abbrevint(f)) != 0) {
+	if ((count = read_varint(f)) != 0) {
 		(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
 		temp_xattr.count = 0;
 	}
@@ -573,16 +606,12 @@ void receive_xattr(struct file_struct *file, int f)
 	while (count--) {
 		char *ptr, *name;
 		rsync_xa *rxa;
-		size_t name_len = read_abbrevint(f);
-		size_t datum_len = read_abbrevint(f);
+		size_t name_len = read_varint(f);
+		size_t datum_len = read_varint(f);
 		size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len;
-#ifdef HAVE_LINUX_XATTRS
-		size_t extra_len = 0;
-#else
-		size_t extra_len = am_root ? RPRE_LEN : 0;
+		size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0;
 		if (dget_len + extra_len < dget_len)
 			out_of_memory("receive_xattr"); /* overflow */
-#endif
 		if (dget_len + extra_len + name_len < dget_len)
 			out_of_memory("receive_xattr"); /* overflow */
 		ptr = new_array(char, dget_len + extra_len + name_len);
@@ -598,9 +627,14 @@ void receive_xattr(struct file_struct *file, int f)
 		}
 #ifdef HAVE_LINUX_XATTRS
 		/* Non-root can only save the user namespace. */
-		if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) {
-			free(ptr);
-			continue;
+			if (am_root <= 0 && !HAS_PREFIX(name, USER_PREFIX)) {
+				if (!am_root) {
+					free(ptr);
+					continue;
+				}
+				name -= RPRE_LEN;
+				name_len += RPRE_LEN;
+				memcpy(name, RSYNC_PREFIX, RPRE_LEN);
 		}
 #else
 		/* This OS only has a user namespace, so we either
@@ -618,6 +652,12 @@ void receive_xattr(struct file_struct *file, int f)
 			continue;
 		}
 #endif
+		/* No rsync.%FOO attributes are copied w/o 2 -X options. */
+		if (preserve_xattrs < 2 && name_len > RPRE_LEN
+		 && name[RPRE_LEN] == '%' && HAS_PREFIX(name, RSYNC_PREFIX)) {
+			free(ptr);
+			continue;
+		}
 		rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, 1);
 		rxa->name = name;
 		rxa->datum = ptr;
@@ -631,9 +671,9 @@ void receive_xattr(struct file_struct *file, int f)
 	F_XATTR(file) = ndx;
 }
 
-/* Turn the xattr data in statx into cached xattr data, setting the index
+/* Turn the xattr data in stat_x into cached xattr data, setting the index
  * values in the file struct. */
-void cache_xattr(struct file_struct *file, statx *sxp)
+void cache_xattr(struct file_struct *file, stat_x *sxp)
 {
 	int ndx;
 
@@ -648,7 +688,7 @@ void cache_xattr(struct file_struct *file, statx *sxp)
 }
 
 static int rsync_xal_set(const char *fname, item_list *xalp,
-			 const char *fnamecmp, statx *sxp)
+			 const char *fnamecmp, stat_x *sxp)
 {
 	rsync_xa *rxas = xalp->items;
 	ssize_t list_len;
@@ -691,7 +731,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 			if (fname == fnamecmp)
 				; /* Value is already set when identical */
 			else if (sys_lsetxattr(fname, name, ptr, len) < 0) {
-				rsyserr(FERROR, errno,
+				rsyserr(FERROR_XFER, errno,
 					"rsync_xal_set: lsetxattr(\"%s\",\"%s\") failed",
 					fname, name);
 				ret = -1;
@@ -714,7 +754,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 		}
 
 		if (sys_lsetxattr(fname, name, rxas[i].datum, rxas[i].datum_len) < 0) {
-			rsyserr(FERROR, errno,
+			rsyserr(FERROR_XFER, errno,
 				"rsync_xal_set: lsetxattr(\"%s\",\"%s\") failed",
 				fname, name);
 			ret = -1;
@@ -734,6 +774,9 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 			    : !HAS_PREFIX(name, USER_PREFIX))
 			continue;
 #endif
+		if (am_root < 0 && name_len > RPRE_LEN
+		 && name[RPRE_LEN] == '%' && strcmp(name, XSTAT_ATTR) == 0)
+			continue;
 
 		for (i = 0; i < xalp->count; i++) {
 			if (strcmp(name, rxas[i].name) == 0)
@@ -741,7 +784,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 		}
 		if (i == xalp->count) {
 			if (sys_lremovexattr(fname, name) < 0) {
-				rsyserr(FERROR, errno,
+				rsyserr(FERROR_XFER, errno,
 					"rsync_xal_clear: lremovexattr(\"%s\",\"%s\") failed",
 					fname, name);
 				ret = -1;
@@ -755,7 +798,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 
 /* Set extended attributes on indicated filename. */
 int set_xattr(const char *fname, const struct file_struct *file,
-	      const char *fnamecmp, statx *sxp)
+	      const char *fnamecmp, stat_x *sxp)
 {
 	int ndx;
 	item_list *lst = rsync_xal_l.items;
@@ -772,4 +815,176 @@ int set_xattr(const char *fname, const struct file_struct *file,
 	return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
 }
 
+#ifdef SUPPORT_ACLS
+char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
+{
+	const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
+	*len_p = 0; /* no extra data alloc needed from get_xattr_data() */
+	return get_xattr_data(fname, name, len_p, 1);
+}
+
+int set_xattr_acl(const char *fname, int is_access_acl, const char *buf, size_t buf_len)
+{
+	const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
+	if (sys_lsetxattr(fname, name, buf, buf_len) < 0) {
+		rsyserr(FERROR_XFER, errno,
+			"set_xattr_acl: lsetxattr(\"%s\",\"%s\") failed",
+			fname, name);
+		return -1;
+	}
+	return 0;
+}
+
+int del_def_xattr_acl(const char *fname)
+{
+	return sys_lremovexattr(fname, XDEF_ACL_ATTR);
+}
+#endif
+
+int get_stat_xattr(const char *fname, int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
+{
+	int mode, rdev_major, rdev_minor, uid, gid, len;
+	char buf[256];
+
+	if (am_root >= 0 || IS_DEVICE(fst->st_mode) || IS_SPECIAL(fst->st_mode))
+		return -1;
+
+	if (xst)
+		*xst = *fst;
+	else
+		xst = fst;
+	if (fname) {
+		fd = -1;
+		len = sys_lgetxattr(fname, XSTAT_ATTR, buf, sizeof buf - 1);
+	} else {
+		fname = "fd";
+		len = sys_fgetxattr(fd, XSTAT_ATTR, buf, sizeof buf - 1);
+	}
+	if (len >= (int)sizeof buf) {
+		len = -1;
+		errno = ERANGE;
+	}
+	if (len < 0) {
+		if (errno == ENOTSUP || errno == ENOATTR)
+			return -1;
+		if (errno == EPERM && S_ISLNK(fst->st_mode)) {
+			xst->st_uid = 0;
+			xst->st_gid = 0;
+			return 0;
+		}
+		rsyserr(FERROR_XFER, errno, "failed to read xattr %s for %s",
+			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",
+			XSTAT_ATTR, full_fname(fname), buf);
+		exit_cleanup(RERR_FILEIO);
+	}
+
+	xst->st_mode = from_wire_mode(mode);
+	xst->st_rdev = MAKEDEV(rdev_major, rdev_minor);
+	xst->st_uid = uid;
+	xst->st_gid = gid;
+
+	return 0;
+}
+
+int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
+{
+	STRUCT_STAT fst, xst;
+	dev_t rdev;
+	mode_t mode, fmode;
+
+	if (dry_run)
+		return 0;
+
+	if (read_only || list_only) {
+		rsyserr(FERROR_XFER, EROFS, "failed to write xattr %s for %s",
+			XSTAT_ATTR, full_fname(fname));
+		return -1;
+	}
+
+	if (x_lstat(fname, &fst, &xst) < 0) {
+		rsyserr(FERROR_XFER, errno, "failed to re-stat %s",
+			full_fname(fname));
+		return -1;
+	}
+
+	fst.st_mode &= (_S_IFMT | CHMOD_BITS);
+	fmode = new_mode & (_S_IFMT | CHMOD_BITS);
+
+	if (IS_DEVICE(fmode) || IS_SPECIAL(fmode)) {
+		uint32 *devp = F_RDEV_P(file);
+		rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+	} else
+		rdev = 0;
+
+	/* Dump the special permissions and enable full owner access. */
+	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 == fmode && fst.st_rdev == rdev
+	 && fst.st_uid == F_OWNER(file) && fst.st_gid == F_GROUP(file)) {
+		/* xst.st_mode will be 0 if there's no current stat xattr */
+		if (xst.st_mode && sys_lremovexattr(fname, XSTAT_ATTR) < 0) {
+			rsyserr(FERROR_XFER, errno,
+				"delete of stat xattr failed for %s",
+				full_fname(fname));
+			return -1;
+		}
+		return 0;
+	}
+
+	if (xst.st_mode != fmode || xst.st_rdev != rdev
+	 || xst.st_uid != F_OWNER(file) || xst.st_gid != F_GROUP(file)) {
+		char buf[256];
+		int len = snprintf(buf, sizeof buf, "%o %u,%u %u:%u",
+			to_wire_mode(fmode),
+			(int)major(rdev), (int)minor(rdev),
+			F_OWNER(file), F_GROUP(file));
+		if (sys_lsetxattr(fname, XSTAT_ATTR, buf, len) < 0) {
+			if (errno == EPERM && S_ISLNK(fst.st_mode))
+				return 0;
+			rsyserr(FERROR_XFER, errno,
+				"failed to write xattr %s for %s",
+				XSTAT_ATTR, full_fname(fname));
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
+{
+	int ret = do_stat(fname, fst);
+	if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
+		xst->st_mode = 0;
+	return ret;
+}
+
+int x_lstat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
+{
+	int ret = do_lstat(fname, fst);
+	if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
+		xst->st_mode = 0;
+	return ret;
+}
+
+int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
+{
+	int ret = do_fstat(fd, fst);
+	if ((ret < 0 || get_stat_xattr(NULL, fd, fst, xst) < 0) && xst)
+		xst->st_mode = 0;
+	return ret;
+}
+
 #endif /* SUPPORT_XATTRS */