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)
15 @@ -163,13 +163,6 @@ void setup_protocol(int f_out,int f_in)
16 if (protocol_version < 30) {
19 - if (preserve_xattrs && !local_server) {
21 - "--xattrs requires protocol 30 or higher"
22 - " (negotiated %d).\n",
24 - exit_cleanup(RERR_PROTOCOL);
28 if (delete_mode && !(delete_before+delete_during+delete_after)) {
36 #include "lib/sysxattrs.h"
39 @@ -33,6 +34,7 @@ extern int read_only;
41 extern int preserve_xattrs;
42 extern int checksum_seed;
43 +extern int protocol_version;
45 #define RSYNC_XAL_INITIAL 5
46 #define RSYNC_XAL_LIST_INITIAL 100
47 @@ -233,7 +235,7 @@ static int rsync_xal_get(const char *fna
48 if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
51 - if (datum_len > MAX_FULL_DATUM) {
52 + if (datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
53 /* For large datums, we store a flag and a checksum. */
54 name_offset = 1 + MAX_DIGEST_LEN;
55 sum_init(checksum_seed);
56 @@ -297,7 +299,7 @@ static int find_matching_xattr(item_list
57 || rxas1[j].datum_len != rxas2[j].datum_len
58 || strcmp(rxas1[j].name, rxas2[j].name))
60 - if (rxas1[j].datum_len > MAX_FULL_DATUM) {
61 + if (rxas1[j].datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
62 if (memcmp(rxas1[j].datum + 1,
65 @@ -334,34 +336,43 @@ int send_xattr(statx *sxp, int f)
67 int ndx = find_matching_xattr(sxp->xattr);
69 - /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
70 - write_varint(f, ndx + 1);
71 + if (protocol_version < 30) {
79 + /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
80 + write_varint(f, ndx + 1);
85 int count = sxp->xattr->count;
86 - write_varint(f, count);
87 + write_varint30(f, count);
88 for (rxa = sxp->xattr->items; count--; rxa++) {
89 #ifdef HAVE_LINUX_XATTRS
90 - write_varint(f, rxa->name_len);
91 - write_varint(f, rxa->datum_len);
92 + write_varint30(f, rxa->name_len);
93 + write_varint30(f, rxa->datum_len);
94 write_buf(f, rxa->name, rxa->name_len);
96 /* We strip the rsync prefix from disguised namespaces
97 * and put everything else in the user namespace. */
98 if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
99 && rxa->name[RPRE_LEN] != '%') {
100 - write_varint(f, rxa->name_len - RPRE_LEN);
101 - write_varint(f, rxa->datum_len);
102 + write_varint30(f, rxa->name_len - RPRE_LEN);
103 + write_varint30(f, rxa->datum_len);
104 write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
106 - write_varint(f, rxa->name_len + UPRE_LEN);
107 - write_varint(f, rxa->datum_len);
108 + write_varint30(f, rxa->name_len + UPRE_LEN);
109 + write_varint30(f, rxa->datum_len);
110 write_buf(f, USER_PREFIX, UPRE_LEN);
111 write_buf(f, rxa->name, rxa->name_len);
114 - if (rxa->datum_len > MAX_FULL_DATUM)
115 + if (rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30)
116 write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
118 write_buf(f, rxa->datum, rxa->datum_len);
119 @@ -411,7 +422,7 @@ int xattr_diff(struct file_struct *file,
120 cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
123 - else if (snd_rxa->datum_len > MAX_FULL_DATUM) {
124 + else if (snd_rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30) {
125 same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
126 && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
127 MAX_DIGEST_LEN) == 0;
128 @@ -454,6 +465,9 @@ void send_xattr_request(const char *fnam
129 int j, cnt, prior_req = -1;
132 + if (protocol_version < 30)
135 lst += F_XATTR(file);
137 for (rxa = lst->items, j = 0; j < cnt; rxa++, j++) {
138 @@ -525,6 +539,9 @@ void recv_xattr_request(struct file_stru
142 + if (protocol_version < 30)
145 if (F_XATTR(file) < 0) {
146 rprintf(FERROR, "recv_xattr_request: internal data error!\n");
147 exit_cleanup(RERR_STREAMIO);
148 @@ -571,7 +588,22 @@ void receive_xattr(struct file_struct *f
150 static item_list temp_xattr = EMPTY_ITEM_LIST;
152 - int ndx = read_varint(f);
155 + if (protocol_version >= 30)
156 + ndx = read_varint(f);
158 + int tag = read_byte(f);
160 + ndx = read_int(f) + 1;
161 + else if (tag == 'X')
164 + rprintf(FERROR, "receive_xattr: unknown extended attribute"
165 + " type tag (%02x) for %s\n", tag, f_name(file, NULL));
166 + exit_cleanup(RERR_STREAMIO);
170 if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
171 rprintf(FERROR, "receive_xattr: xa index %d out of"
172 @@ -584,7 +616,7 @@ void receive_xattr(struct file_struct *f
176 - if ((count = read_varint(f)) != 0) {
177 + if ((count = read_varint30(f)) != 0) {
178 (void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
179 temp_xattr.count = 0;
181 @@ -592,9 +624,10 @@ void receive_xattr(struct file_struct *f
185 - size_t name_len = read_varint(f);
186 - size_t datum_len = read_varint(f);
187 - size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len;
188 + size_t name_len = read_varint30(f);
189 + size_t datum_len = read_varint30(f);
190 + size_t dget_len = datum_len > MAX_FULL_DATUM && protocol_version >= 30
191 + ? 1 + MAX_DIGEST_LEN : datum_len;
192 size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0;
193 if (dget_len + extra_len < dget_len)
194 out_of_memory("receive_xattr"); /* overflow */