Fixed a bug in the propagation of a filter rule's "r" modifier

to a server-sender.

diff --git a/sender-receiver-excludes.diff b/sender-receiver-excludes.diff
index 0aa0285..acef5b3 100644 (file)
--- a/sender-receiver-excludes.diff
+++ b/sender-receiver-excludes.diff
@@ -116,7 +116,7 @@ See the updated manpage for the details.
 +      if (match_flags & MATCHFLG_SENDER_SIDE && !for_xfer)
 +              *op++ = 's';
 +      if (match_flags & MATCHFLG_RECEIVER_SIDE
-+          && (!for_xfer || delete_excluded))
++          && (!for_xfer || (delete_excluded && am_sender)))
 +              *op++ = 'r';
        if (legal_len)
                *op++ = ' ';
@@ -209,9 +209,9 @@ See the updated manpage for the details.
 +      if (local_server) /* filter out any rules that aren't for us. */
 +              send_rules(-1, &filter_list);
  }
---- orig/flist.c       2005-02-07 20:41:56
+--- orig/flist.c       2005-02-09 02:37:15
 +++ flist.c    2005-02-05 05:31:09
-@@ -980,7 +980,7 @@ void send_file_name(int f, struct file_l
+@@ -978,7 +978,7 @@ void send_file_name(int f, struct file_l
  
        /* f is set to -1 when calculating deletion file list */
        file = make_file(fname, flist,