extern int local_server;
extern int inplace;
extern int recurse;
+extern int allow_inc_recurse;
extern int fuzzy_basis;
extern int read_batch;
extern int max_delete;
extern int protocol_version;
extern int preserve_uid;
extern int preserve_gid;
+extern int preserve_acls;
+extern int preserve_xattrs;
extern int preserve_hard_links;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
extern int delete_excluded;
extern int make_backups;
+extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
extern char *backup_dir, *backup_suffix;
extern char *partial_dir;
extern char *dest_option;
extern struct filter_list_struct filter_list;
+/* The server makes sure that if either side only supports a pre-release
+ * version of a protocol, that both sides must speak a compatible version
+ * of that protocol for it to be advertised as available. */
+static void check_sub_protocol(void)
+{
+ char *dot;
+ int their_protocol, their_sub;
+ int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
+
+ if (!shell_cmd || !(dot = strchr(shell_cmd, '.'))
+ || !(their_protocol = atoi(shell_cmd))
+ || !(their_sub = atoi(dot+1))) {
+ if (our_sub)
+ protocol_version--;
+ return;
+ }
+
+ if (their_protocol < protocol_version) {
+ if (their_sub)
+ protocol_version = their_protocol - 1;
+ return;
+ }
+
+ if (their_protocol > protocol_version)
+ their_sub = 0; /* 0 == final version */
+ if (their_sub != our_sub)
+ protocol_version--;
+}
+
void setup_protocol(int f_out,int f_in)
{
if (am_sender)
preserve_uid = ++file_extra_cnt;
if (preserve_gid)
preserve_gid = ++file_extra_cnt;
+ if (preserve_acls && !am_sender)
+ preserve_acls = ++file_extra_cnt;
+ if (preserve_xattrs)
+ preserve_xattrs = ++file_extra_cnt;
if (remote_protocol == 0) {
+ if (am_server && !local_server)
+ check_sub_protocol();
if (!read_batch)
write_int(f_out, protocol_version);
remote_protocol = read_int(f_in);
protocol_version = remote_protocol;
}
if (read_batch && remote_protocol > protocol_version) {
- rprintf(FERROR, "The protocol version in the batch file is too new (%d > %d).\n",
+ rprintf(FERROR, "The protocol version in the batch file is too new (%d > %d).\n",
remote_protocol, protocol_version);
exit_cleanup(RERR_PROTOCOL);
}
protocol_version);
exit_cleanup(RERR_PROTOCOL);
}
+ if (preserve_acls && !local_server) {
+ rprintf(FERROR,
+ "--acls requires protocol 30 or higher"
+ " (negotiated %d).\n",
+ protocol_version);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ if (preserve_xattrs && !local_server) {
+ rprintf(FERROR,
+ "--xattrs requires protocol 30 or higher"
+ " (negotiated %d).\n",
+ protocol_version);
+ exit_cleanup(RERR_PROTOCOL);
+ }
}
if (delete_mode && !(delete_before+delete_during+delete_after)) {
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
- if (recurse && !preserve_hard_links && !delete_before
- && !delete_after && !delay_updates && !prune_empty_dirs)
+ if (recurse && allow_inc_recurse && !preserve_hard_links
+ && !delete_before && !delete_after && !delay_updates
+ && !prune_empty_dirs)
inc_recurse = 1;
need_messages_from_generator = 1;
}