1 This patch adds backward-compatibility support for the --xattrs option.
2 Since the main release has never had xattr support, the trunk doesn't
3 need this code. If you want to make rsync 3.0.x communicate with an
4 older (patched) release, use this.
6 To use this patch, run these commands for a successful build:
8 patch -p1 <patches/acls.diff
9 patch -p1 <patches/xattrs.diff
10 ./configure (optional if already run)
13 diff --git a/compat.c b/compat.c
14 index 1b66069..fb46fa5 100644
17 @@ -189,13 +189,6 @@ void setup_protocol(int f_out,int f_in)
18 if (protocol_version < 30) {
21 - if (preserve_xattrs && !local_server) {
23 - "--xattrs requires protocol 30 or higher"
24 - " (negotiated %d).\n",
26 - exit_cleanup(RERR_PROTOCOL);
30 if (delete_mode && !(delete_before+delete_during+delete_after)) {
31 diff --git a/xattrs.c b/xattrs.c
32 index 2d0e050..b2017ed 100644
40 #include "lib/sysxattrs.h"
43 @@ -34,6 +35,7 @@ extern int read_only;
45 extern int preserve_xattrs;
46 extern int checksum_seed;
47 +extern int protocol_version;
49 #define RSYNC_XAL_INITIAL 5
50 #define RSYNC_XAL_LIST_INITIAL 100
51 @@ -247,7 +249,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
52 if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
55 - if (datum_len > MAX_FULL_DATUM) {
56 + if (datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
57 /* For large datums, we store a flag and a checksum. */
58 name_offset = 1 + MAX_DIGEST_LEN;
59 sum_init(checksum_seed);
60 @@ -349,7 +351,7 @@ static int find_matching_xattr(item_list *xalp)
61 || rxas1[j].datum_len != rxas2[j].datum_len
62 || strcmp(rxas1[j].name, rxas2[j].name))
64 - if (rxas1[j].datum_len > MAX_FULL_DATUM) {
65 + if (rxas1[j].datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
66 if (memcmp(rxas1[j].datum + 1,
69 @@ -386,13 +388,22 @@ int send_xattr(stat_x *sxp, int f)
71 int ndx = find_matching_xattr(sxp->xattr);
73 - /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
74 - write_varint(f, ndx + 1);
75 + if (protocol_version < 30) {
83 + /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
84 + write_varint(f, ndx + 1);
89 int count = sxp->xattr->count;
90 - write_varint(f, count);
91 + write_varint30(f, count);
92 for (rxa = sxp->xattr->items; count--; rxa++) {
93 size_t name_len = rxa->name_len;
94 const char *name = rxa->name;
95 @@ -411,8 +422,8 @@ int send_xattr(stat_x *sxp, int f)
99 - write_varint(f, name_len);
100 - write_varint(f, rxa->datum_len);
101 + write_varint30(f, name_len);
102 + write_varint30(f, rxa->datum_len);
103 #ifndef HAVE_LINUX_XATTRS
104 if (name_len > rxa->name_len) {
105 write_buf(f, USER_PREFIX, UPRE_LEN);
106 @@ -420,7 +431,7 @@ int send_xattr(stat_x *sxp, int f)
109 write_buf(f, name, name_len);
110 - if (rxa->datum_len > MAX_FULL_DATUM)
111 + if (rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30)
112 write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
114 write_buf(f, rxa->datum, rxa->datum_len);
115 @@ -470,7 +481,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
116 cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
119 - else if (snd_rxa->datum_len > MAX_FULL_DATUM) {
120 + else if (snd_rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
121 same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
122 && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
123 MAX_DIGEST_LEN) == 0;
124 @@ -515,6 +526,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
125 int cnt, prior_req = 0;
128 + if (protocol_version < 30)
131 lst += F_XATTR(file);
132 for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
133 if (rxa->datum_len <= MAX_FULL_DATUM)
134 @@ -571,6 +585,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
136 int rel_pos, cnt, num, got_xattr_data = 0;
138 + if (protocol_version < 30)
141 if (F_XATTR(file) < 0) {
142 rprintf(FERROR, "recv_xattr_request: internal data error!\n");
143 exit_cleanup(RERR_STREAMIO);
144 @@ -633,7 +650,22 @@ void receive_xattr(struct file_struct *file, int f)
148 - int ndx = read_varint(f);
151 + if (protocol_version >= 30)
152 + ndx = read_varint(f);
154 + int tag = read_byte(f);
156 + ndx = read_int(f) + 1;
157 + else if (tag == 'X')
160 + rprintf(FERROR, "receive_xattr: unknown extended attribute"
161 + " type tag (%02x) for %s\n", tag, f_name(file, NULL));
162 + exit_cleanup(RERR_STREAMIO);
166 if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
167 rprintf(FERROR, "receive_xattr: xa index %d out of"
168 @@ -646,7 +678,7 @@ void receive_xattr(struct file_struct *file, int f)
172 - if ((count = read_varint(f)) != 0) {
173 + if ((count = read_varint30(f)) != 0) {
174 (void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
175 temp_xattr.count = 0;
177 @@ -654,9 +686,10 @@ void receive_xattr(struct file_struct *file, int f)
178 for (num = 1; num <= count; num++) {
181 - size_t name_len = read_varint(f);
182 - size_t datum_len = read_varint(f);
183 - size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len;
184 + size_t name_len = read_varint30(f);
185 + size_t datum_len = read_varint30(f);
186 + size_t dget_len = datum_len > MAX_FULL_DATUM && protocol_version >= 30
187 + ? 1 + MAX_DIGEST_LEN : datum_len;
188 size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0;
189 if ((dget_len + extra_len < dget_len)
190 || (dget_len + extra_len + name_len < dget_len))