--- old/acls.c
+++ new/acls.c
-@@ -281,6 +281,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra
+@@ -307,6 +307,9 @@ static BOOL unpack_smb_acl(SMB_ACL_T sac
}
access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
| (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
| (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
/* continue == done with entry; break == store in temporary ida list */
switch (tag_type) {
-@@ -375,6 +378,12 @@ static int store_access_in_entry(uchar a
+@@ -401,6 +404,12 @@ static int store_access_in_entry(uchar a
COE( sys_acl_get_permset,(entry, &permset) );
COE( sys_acl_clear_perms,(permset) );
if (access & 4)
COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
if (access & 2)
-@@ -408,7 +417,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -434,7 +443,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER_OBJ) );
for (ida = racl->users.idas, count = racl->users.count; count--; ida++) {
COE( sys_acl_create_entry,(smb_acl, &entry) );
-@@ -419,7 +428,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -445,7 +454,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP_OBJ) );
for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) {
COE( sys_acl_create_entry,(smb_acl, &entry) );
-@@ -429,7 +438,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -455,7 +464,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
}
#ifdef ACLS_NEED_MASK
-- mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 7 : racl->mask;
-+ mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 077 : racl->mask;
+- mask_bits = racl->mask_obj == NO_ENTRY ? racl->group_obj & 7 : racl->mask_obj;
++ mask_bits = racl->mask_obj == NO_ENTRY ? racl->group_obj & 077 : racl->mask_obj;
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
COE2( store_access_in_entry,(mask_bits, entry) );
-@@ -443,7 +452,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -469,7 +478,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_OTHER) );
-- COE2( store_access_in_entry,(racl->other & 7, entry) );
-+ COE2( store_access_in_entry,(racl->other & 077, entry) );
+- COE2( store_access_in_entry,(racl->other_obj & 7, entry) );
++ COE2( store_access_in_entry,(racl->other_obj & 077, entry) );
#ifdef DEBUG
if (sys_acl_valid(*smb_acl) < 0)
-@@ -646,7 +655,7 @@ static void receive_rsync_acl(rsync_acl
+@@ -766,7 +775,7 @@ static void old_recv_rsync_acl(rsync_acl
while (count--) {
char tag = read_byte(f);
uchar access = read_byte(f);
- if (access & ~ (4 | 2 | 1)) {
+ if (access & ~(32 | 16 | 8 | 4 | 2 | 1)) {
- rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
+ rprintf(FERROR, "old_recv_rsync_acl: bogus permset %o\n",
access);
exit_cleanup(RERR_STREAMIO);
-@@ -722,7 +731,7 @@ static void receive_rsync_acl(rsync_acl
- racl->mask = NO_ENTRY;
+@@ -832,7 +841,7 @@ static void old_recv_rsync_acl(rsync_acl
+ racl->mask_obj = NO_ENTRY;
}
- } else if (racl->mask == NO_ENTRY) /* Must be non-empty with lists. */
-- racl->mask = computed_mask_bits | (racl->group_obj & 7);
-+ racl->mask = computed_mask_bits | (racl->group_obj & 077);
+ } else if (racl->mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
+- racl->mask_obj = computed_mask_bits | (racl->group_obj & 7);
++ racl->mask_obj = computed_mask_bits | (racl->group_obj & 077);
}
/* Receive the ACL info the sender has included for this file-list entry. */
+@@ -904,7 +913,7 @@ static uchar recv_acl_access(uchar *name
+ *name_follows_val = 0;
+ }
+
+- if (access & ~(4 | 2 | 1)) {
++ if (access & ~(32 | 16 | 8 | 4 | 2 | 1)) {
+ rprintf(FERROR, "recv_acl_access: bogus permset %o\n", access);
+ exit_cleanup(RERR_STREAMIO);
+ }
--- old/smb_acls.h
+++ new/smb_acls.h
@@ -33,6 +33,11 @@
--- old/compat.c
+++ new/compat.c
-@@ -56,6 +56,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -62,6 +62,8 @@ void setup_protocol(int f_out,int f_in)
preserve_uid = ++file_extra_cnt;
if (preserve_gid)
preserve_gid = ++file_extra_cnt;
+ if (preserve_atimes)
+ preserve_atimes = ++file_extra_cnt;
+ if (preserve_acls && !am_sender)
+ preserve_acls = ++file_extra_cnt;
- if (remote_protocol == 0) {
- if (!read_batch)
--- old/flist.c
+++ new/flist.c
@@ -48,6 +48,7 @@ extern int preserve_devices;
double len;
if (!F_IS_ACTIVE(f)) {
-@@ -155,14 +157,16 @@ static void list_file_entry(struct file_
+@@ -157,14 +159,16 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
f_name(f, NULL));
}
}
-@@ -346,6 +350,7 @@ int push_flist_dir(const char *dir, int
+@@ -348,6 +352,7 @@ int push_flist_dir(const char *dir, int
static void send_file_entry(int f, struct file_struct *file, int ndx)
{
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -413,6 +418,13 @@ static void send_file_entry(int f, struc
+@@ -415,6 +420,13 @@ static void send_file_entry(int f, struc
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
-@@ -480,6 +492,8 @@ static void send_file_entry(int f, struc
+@@ -482,6 +494,8 @@ static void send_file_entry(int f, struc
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
+ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
+ write_int(f, atime);
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- write_int(f, uid);
+ write_abbrevint30(f, uid);
if (flags & XMIT_USER_NAME_FOLLOWS) {
-@@ -553,7 +567,7 @@ static void send_file_entry(int f, struc
+@@ -558,7 +572,7 @@ static void send_file_entry(int f, struc
static struct file_struct *recv_file_entry(struct file_list *flist,
int flags, int f)
{
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -650,6 +664,8 @@ static struct file_struct *recv_file_ent
+@@ -655,6 +669,8 @@ static struct file_struct *recv_file_ent
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
-@@ -758,6 +774,8 @@ static struct file_struct *recv_file_ent
+@@ -769,6 +785,8 @@ static struct file_struct *recv_file_ent
F_OWNER(file) = uid;
if (preserve_gid)
F_GROUP(file) = gid;
if (basename != thisname) {
file->dirname = lastdir;
-@@ -1055,6 +1073,8 @@ struct file_struct *make_file(const char
+@@ -1074,6 +1092,8 @@ struct file_struct *make_file(const char
F_OWNER(file) = st.st_uid;
if (preserve_gid)
F_GROUP(file) = st.st_gid;
extern int omit_dir_times;
extern int delete_mode;
extern int delete_before;
-@@ -539,6 +540,9 @@ void itemize(struct file_struct *file, i
+@@ -552,6 +553,9 @@ void itemize(const char *fname, struct f
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && cmp_time(F_ATIME(file), st->st_atime) != 0)
+ iflags |= ITEM_REPORT_ATIME;
- if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
+ if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && F_UID(file) != st->st_uid)
-@@ -849,6 +853,8 @@ static int try_dests_reg(struct file_str
+ if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
+@@ -852,6 +856,8 @@ static int try_dests_reg(struct file_str
if (link_dest) {
if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
+ if (preserve_atimes)
+ set_file_attrs(fname, file, stp, 0);
if (preserve_hard_links && F_IS_HLINKED(file))
- finish_hard_link(file, fname, stp, itemizing, code, j);
+ finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
--- old/log.c
+++ new/log.c
-@@ -37,6 +37,7 @@ extern int msg_fd_out;
+@@ -36,6 +36,7 @@ extern int msg_fd_out;
extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
extern int preserve_uid;
extern int preserve_gid;
extern int stdout_format_has_i;
-@@ -625,7 +626,8 @@ static void log_formatted(enum logcode c
+@@ -624,7 +625,8 @@ static void log_formatted(enum logcode c
c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
-- c[8] = '.';
+- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
+ c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
+ : S_ISLNK(file->mode) ? 'U' : 'u';
- c[9] = '\0';
-
- if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+ c[11] = '\0';
--- old/options.c
+++ new/options.c
@@ -55,6 +55,7 @@ int preserve_uid = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -307,8 +308,9 @@ void usage(enum logcode F)
+@@ -315,8 +316,9 @@ void usage(enum logcode F)
rprintf(F," --devices preserve device files (super-user only)\n");
rprintf(F," --specials preserve special files\n");
rprintf(F," -D same as --devices --specials\n");
rprintf(F," --super receiver attempts super-user activities\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -425,6 +427,9 @@ static struct poptOption long_options[]
+@@ -436,6 +438,9 @@ static struct poptOption long_options[]
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
-@@ -1552,6 +1557,8 @@ void server_options(char **args,int *arg
+@@ -1577,6 +1582,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
else if (preserve_executability && am_sender)
--- old/rsync.c
+++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int verbose;
- extern int dry_run;
+@@ -34,6 +34,7 @@ extern int dry_run;
+ extern int preserve_acls;
extern int preserve_perms;
extern int preserve_executability;
+extern int preserve_atimes;
extern int preserve_times;
extern int omit_dir_times;
extern int am_root;
-@@ -232,6 +233,7 @@ int set_file_attrs(char *fname, struct f
+@@ -234,6 +235,7 @@ int set_file_attrs(char *fname, struct f
int updated = 0;
- STRUCT_STAT st2;
+ statx sx2;
int change_uid, change_gid;
+ time_t atime, mtime;
mode_t new_mode = file->mode;
- if (!st) {
-@@ -251,18 +253,36 @@ int set_file_attrs(char *fname, struct f
- }
- }
+ if (!sxp) {
+@@ -261,18 +263,36 @@ int set_file_attrs(char *fname, struct f
+ get_acl(fname, sxp);
+ #endif
+ /* This code must be the first update in the function due to
+ * how it uses the "updated" variable. */
- if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
+ if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
flags |= ATTRS_SKIP_MTIME;
-+ if (!preserve_atimes || S_ISDIR(st->st_mode))
++ if (!preserve_atimes || S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_ATIME;
if (!(flags & ATTRS_SKIP_MTIME)
- && cmp_time(st->st_mtime, file->modtime) != 0) {
-- int ret = set_modtime(fname, file->modtime, st->st_mode);
+ && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+- int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
+ mtime = file->modtime;
+ updated = 1;
+ } else
-+ mtime = st->st_mtime;
++ mtime = sxp->st.st_mtime;
+ if (!(flags & ATTRS_SKIP_ATIME)) {
+ time_t file_atime = F_ATIME(file);
-+ if (cmp_time(st->st_atime, file_atime) != 0) {
++ if (cmp_time(sxp->st.st_atime, file_atime) != 0) {
+ atime = file_atime;
+ updated = 1;
+ } else
-+ atime = st->st_atime;
++ atime = sxp->st.st_atime;
+ } else
-+ atime = st->st_atime;
++ atime = sxp->st.st_atime;
+ if (updated) {
-+ int ret = set_times(fname, mtime, atime, st->st_mode);
++ int ret = set_times(fname, mtime, atime, sxp->st.st_mode);
if (ret < 0) {
rsyserr(FERROR, errno, "failed to set times on %s",
full_fname(fname));
- return 0;
+ goto cleanup;
}
- if (ret == 0) /* ret == 1 if symlink could not be set */
- updated = 1;
+ updated = 0;
}
- change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
+ change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
--- old/rsync.h
+++ new/rsync.h
-@@ -57,6 +57,7 @@
+@@ -56,6 +56,7 @@
#define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
#define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */
#define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */
/* These flags are used in the live flist data. */
-@@ -135,6 +136,7 @@
+@@ -136,6 +137,7 @@
#define ATTRS_REPORT (1<<0)
#define ATTRS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -565,6 +567,7 @@ struct file_struct {
- extern int file_extra_cnt;
+@@ -571,6 +573,7 @@ extern int file_extra_cnt;
extern int preserve_uid;
extern int preserve_gid;
+ extern int preserve_acls;
+extern int preserve_atimes;
#define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
#define EXTRA_LEN (sizeof (union file_extras))
-@@ -597,6 +600,7 @@ extern int preserve_gid;
+@@ -603,6 +606,7 @@ extern int preserve_acls;
/* When the associated option is on, all entries will have these present: */
#define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
#define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
+ #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
/* These items are per-entry optional and mutally exclusive: */
- #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
--- old/rsync.yo
+++ new/rsync.yo
-@@ -328,8 +328,9 @@ to the detailed description below for a
+@@ -329,8 +329,9 @@ to the detailed description below for a
--devices preserve device files (super-user only)
--specials preserve special files
-D same as --devices --specials
--super receiver attempts super-user activities
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-@@ -870,6 +871,12 @@ it is preserving modification times (see
+@@ -896,6 +897,12 @@ it is preserving modification times (see
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
dit(bf(--super)) This tells the receiving side to attempt super-user
activities even if the receiving rsync wasn't run by the super-user. These
activities include: preserving users via the bf(--owner) option, preserving
-@@ -1403,7 +1410,7 @@ with older versions of rsync, but that a
- verbose messages).
-
- The "%i" escape has a cryptic output that is 9 letters long. The general
--format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
-+format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
- type of update being done, bf(X) is replaced by the file-type, and the
- other letters represent attributes that may be output if they are being
- modified.
-@@ -1443,7 +1450,7 @@ quote(itemization(
+@@ -1482,7 +1489,7 @@ quote(itemization(
by the file transfer.
it() A bf(t) means the modification time is different and is being updated
to the sender's value (requires bf(--times)). An alternate value of bf(T)
anytime a symlink is transferred, or when a file or device is transferred
without bf(--times).
it() A bf(p) means the permissions are different and are being updated to
-@@ -1452,7 +1459,10 @@ quote(itemization(
+@@ -1491,8 +1498,10 @@ quote(itemization(
sender's value (requires bf(--owner) and super-user privileges).
it() A bf(g) means the group is different and is being updated to the
sender's value (requires bf(--group) and the authority to set the group).
-- it() The bf(z) slot is reserved for future use.
+- it() The bf(u) slot is reserved for reporting update (access) time changes
+- (a feature that is not yet released).
+ it() A bf(u) means the access (use) time is different and is being updated to
+ the sender's value (requires bf(--atimes)). An alternate value of bf(U)
+ means that the access time will be set to the transfer time, which happens
+ when a symlink or directory is updated.
- ))
-
- One other output is possible: when deleting files, the "%i" will output
+ it() The bf(a) means that the ACL information changed.
+ it() The bf(x) slot is reserved for reporting extended attribute changes
+ (a feature that is not yet released).
--- old/sender.c
+++ new/sender.c
-@@ -42,6 +42,7 @@ extern int do_progress;
+@@ -41,6 +41,7 @@ extern int do_progress;
extern int inplace;
extern int batch_fd;
extern int write_batch;
+extern unsigned int file_struct_len;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist;
- extern char *stdout_format;
+
--- old/testsuite/atimes.test
+++ new/testsuite/atimes.test
@@ -0,0 +1,19 @@
}
--- old/util.c
+++ new/util.c
-@@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char *
+@@ -120,7 +120,7 @@ NORETURN void overflow_exit(const char *
exit_cleanup(RERR_MALLOC);
}
{
#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
if (S_ISLNK(mode))
-@@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_
+@@ -128,9 +128,13 @@ int set_modtime(const char *fname, time_
#endif
if (verbose > 2) {
}
if (dry_run)
-@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_
+@@ -139,7 +143,7 @@ int set_modtime(const char *fname, time_
{
#ifdef HAVE_UTIMES
struct timeval t[2];
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_
+@@ -152,12 +156,12 @@ int set_modtime(const char *fname, time_
return utimes(fname, t);
#elif defined HAVE_UTIMBUF
struct utimbuf tbuf;
if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
continue;
#ifdef SUPPORT_ACLS
-@@ -142,6 +146,12 @@ static int make_bak_dir(char *fullpath)
- cache_acl(file, &sx);
+@@ -143,6 +147,12 @@ static int make_bak_dir(char *fullpath)
+ free_acl(&sx);
}
#endif
+#ifdef SUPPORT_XATTRS
set_file_attrs(fullpath, file, NULL, 0);
free(file);
}
-@@ -193,6 +203,9 @@ static int keep_backup(const char *fname
+@@ -194,6 +204,9 @@ static int keep_backup(const char *fname
#ifdef SUPPORT_ACLS
sx.acc_acl = sx.def_acl = NULL;
#endif
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
-@@ -208,6 +221,12 @@ static int keep_backup(const char *fname
- cache_acl(file, &sx);
+@@ -210,6 +223,12 @@ static int keep_backup(const char *fname
+ free_acl(&sx);
}
#endif
+#ifdef SUPPORT_XATTRS
if (!read_batch)
--- old/configure.in
+++ new/configure.in
-@@ -883,6 +883,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
- AC_MSG_RESULT(no)
- )
+@@ -881,6 +881,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+ esac
+ fi
+AC_CHECK_HEADERS(attr/xattr.h)
+AC_CHECK_HEADERS(sys/xattr.h)
extern int preserve_hard_links;
extern int preserve_devices;
@@ -864,6 +865,10 @@ static struct file_struct *recv_file_ent
- if (preserve_acls)
+ if (preserve_acls && !S_ISLNK(mode))
receive_acl(file, f);
#endif
+#ifdef SUPPORT_XATTRS
maybe_emit_filelist_progress(flist->count + flist_count_offset);
-@@ -1166,6 +1178,10 @@ static struct file_struct *send_file_nam
- if (preserve_acls)
- send_acl(&sx, f);
+@@ -1168,6 +1180,10 @@ static struct file_struct *send_file_nam
+ free_acl(&sx);
+ }
#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
* will enable owner-writability using chmod, if necessary.
--- old/rsync.h
+++ new/rsync.h
-@@ -555,6 +555,10 @@ struct idev_node {
+@@ -551,6 +551,10 @@ struct idev_node {
#define ACLS_NEED_MASK 1
#endif
#define GID_NONE ((gid_t)-1)
union file_extras {
-@@ -575,6 +579,7 @@ extern int file_extra_cnt;
+@@ -571,6 +575,7 @@ extern int file_extra_cnt;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
#define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
#define EXTRA_LEN (sizeof (union file_extras))
-@@ -608,6 +613,7 @@ extern int preserve_acls;
+@@ -604,6 +609,7 @@ extern int preserve_acls;
#define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
#define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
/* These items are per-entry optional and mutally exclusive: */
#define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
-@@ -799,6 +805,9 @@ typedef struct {
+@@ -795,6 +801,9 @@ typedef struct {
struct rsync_acl *acc_acl; /* access ACL */
struct rsync_acl *def_acl; /* default ACL */
#endif
@@ -324,6 +324,7 @@ to the detailed description below for a
-E, --executability preserve executability
--chmod=CHMOD affect file and/or directory permissions
- -A, --acls preserve ACLs (implies -p) [non-standard]
-+ -X, --xattrs preserve extended attrs (implies -p) [n.s.]
+ -A, --acls preserve ACLs (implies -p)
++ -X, --xattrs preserve extended attrs (implies -p)
-o, --owner preserve owner (super-user only)
-g, --group preserve group
--devices preserve device files (super-user only)
-@@ -835,6 +836,11 @@ The ACL-sending protocol used by this ve
- the patch that was shipped with 2.6.8. Sending ACLs to an older version
- of the ACL patch is not supported.
+@@ -831,6 +832,11 @@ dit(bf(-A, --acls)) This option causes r
+ ACLs to be the same as the source ACLs. This nonstandard option only
+ works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
+dit(bf(-X, --xattrs)) This option causes rsync to update the remote
+extended attributes to be the same as the local ones. This will work
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff