From: Wayne Davison <wayned@samba.org>
Date: Sat, 21 Jan 2006 19:54:14 +0000 (+0000)
Subject: Use the new saw_delete* variables to ensure that the server side
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/b8a39ed58af2859c3a4f2251866c8cf277f92516

Use the new saw_delete* variables to ensure that the server side
always reads the exclude information when it is present.
---

diff --git a/exclude.c b/exclude.c
index 1740f7b4..48434894 100644
--- a/exclude.c
+++ b/exclude.c
@@ -34,6 +34,8 @@ extern int list_only;
 extern int recurse;
 extern int io_error;
 extern int local_server;
+extern int saw_delete_opt;
+extern int saw_delete_excluded_opt;
 extern int delete_mode;
 extern int delete_excluded;
 extern int cvs_exclude;
@@ -1179,8 +1181,8 @@ void recv_filter_list(int f_in)
 {
 	char line[BIGPATHBUFLEN];
 	int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
-	int receiver_wants_list = delete_mode
-		&& (!delete_excluded || protocol_version >= 29);
+	int receiver_wants_list = saw_delete_opt
+		&& (!saw_delete_excluded_opt || protocol_version >= 29);
 	unsigned int len;
 
 	if (!local_server && (am_sender || receiver_wants_list)) {