- Send a flag from the client to the server to indicate if the protocol

  is going to run in inc_recurse mode or not.
- Verify that the options we received (as a server or as a batch-reader)
  are compatible with the requested inc_recurse mode.

1 files changed, 11 insertions, 0 deletions

diff --git a/compat.c b/compat.c
index 80c44a34..a1a0f247 100644
--- a/compat.c
+++ b/compat.c
@@ -220,6 +220,17 @@ void setup_protocol(int f_out,int f_in)
 		 && !delete_before && !delete_after && !delay_updates
 		 && !use_qsort && !prune_empty_dirs)
 			inc_recurse = 1;
+		if (am_server || read_batch) {
+			int i_r = read_byte(f_in);
+			if (i_r && !inc_recurse) {
+				fprintf(stderr,
+				    "Incompatible options specified for inc-recursive %s.\n",
+				    read_batch ? "batch file" : "connection");
+				exit_cleanup(RERR_SYNTAX);
+			}
+			inc_recurse = i_r;
+		} else
+			write_byte(f_out, inc_recurse);
 		need_messages_from_generator = 1;
 	}