Update support/rrsync and some packaging/* scripts.

[rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index fad252890bea51c199ded518ee693d9809e00d85..11854cc432979aa88fe09dd01cfbfa42ed7ab009 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -1300,6 +1300,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                skip_dir = NULL;
        }
 
+#ifdef SUPPORT_ACLS
+       sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+       sx.xattr = NULL;
+#endif
        if (daemon_filter_list.head && (*fname != '.' || fname[1])) {
                if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
                        if (is_dir < 0)
@@ -1317,12 +1323,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                }
        }
 
-#ifdef SUPPORT_ACLS
-       sx.acc_acl = sx.def_acl = NULL;
-#endif
-#ifdef SUPPORT_XATTRS
-       sx.xattr = NULL;
-#endif
        if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
          parent_is_dry_missing:
                if (fuzzy_dirlist) {
@@ -2215,7 +2215,7 @@ void generate_files(int f_out, const char *local_name)
        /* Since we often fill up the outgoing socket and then just sit around
         * waiting for the other 2 processes to do their thing, we don't want
         * to exit on a timeout.  If the data stops flowing, the receiver will
-        * notice that and let us know via the redo pipe (or its closing). */
+        * notice that and let us know via the message pipe (or its closing). */
        ignore_timeout = 1;
 
        dflt_perms = (ACCESSPERMS & ~orig_umask);
@@ -2309,6 +2309,7 @@ void generate_files(int f_out, const char *local_name)
                rprintf(FINFO, "generate_files phase=%d\n", phase);
 
        write_ndx(f_out, NDX_DONE);
+
        /* Reduce round-trip lag-time for a useless delay-updates phase. */
        if (protocol_version >= 29 && !delay_updates)
                write_ndx(f_out, NDX_DONE);