From: Wayne Davison <wayned@samba.org>
Date: Sat, 26 Jun 2010 23:14:15 +0000 (-0700)
Subject: Write out the right compat_flags value into the batch file.
X-Git-Tag: v3.0.8pre1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e51bb8f330d6b6ee3979bb0538e42da997c50d75;p=thirdparty%2Frsync.git

Write out the right compat_flags value into the batch file.
---

diff --git a/compat.c b/compat.c
index c2b475ba..3a4b38e2 100644
--- a/compat.c
+++ b/compat.c
@@ -24,6 +24,7 @@
 int remote_protocol = 0;
 int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
 int inc_recurse = 0;
+int compat_flags = 0;
 int use_safe_inc_flist = 0;
 
 extern int verbose;
@@ -248,7 +249,6 @@ void setup_protocol(int f_out,int f_in)
 			exit_cleanup(RERR_PROTOCOL);
 		}
 	} else if (protocol_version >= 30) {
-		int compat_flags;
 		if (am_server) {
 			compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
 #if defined HAVE_LUTIMES && defined HAVE_UTIMES
diff --git a/io.c b/io.c
index f9fa7c79..6599e5a9 100644
--- a/io.c
+++ b/io.c
@@ -48,6 +48,7 @@ extern int flist_eof;
 extern int list_only;
 extern int read_batch;
 extern int csum_length;
+extern int compat_flags;
 extern int protect_args;
 extern int checksum_seed;
 extern int protocol_version;
@@ -1901,7 +1902,7 @@ void start_write_batch(int fd)
 	 * is involved. */
 	write_int(batch_fd, protocol_version);
 	if (protocol_version >= 30)
-		write_byte(batch_fd, inc_recurse);
+		write_byte(batch_fd, compat_flags);
 	write_int(batch_fd, checksum_seed);
 
 	if (am_sender)