Tweak dir xattrs after the writability fudging.

diff --git a/generator.c b/generator.c
index e3890bb..326ccd8 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -1353,13 +1353,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                                goto cleanup;
                        }
                }
                                goto cleanup;
                        }
                }

-#ifdef SUPPORT_XATTRS
-               if (preserve_xattrs && statret == 1)
-                       copy_xattrs(fnamecmpbuf, fname);
-#endif
-               if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
-                   && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1)
-                       rprintf(code, "%s/\n", fname);

 
                /* We need to ensure that the dirs in the transfer have writable
                 * permissions during the time we are putting files within them.
 
                /* We need to ensure that the dirs in the transfer have writable
                 * permissions during the time we are putting files within them.


@@ -1376,6 +1369,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                }
 #endif
 
                }
 #endif
 

+#ifdef SUPPORT_XATTRS
+               if (preserve_xattrs && statret == 1)
+                       copy_xattrs(fnamecmpbuf, fname);
+#endif
+               if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
+                   && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1)
+                       rprintf(code, "%s/\n", fname);
+

                if (real_ret != 0 && one_file_system)
                        real_sx.st.st_dev = filesystem_dev;
                if (inc_recurse) {
                if (real_ret != 0 && one_file_system)
                        real_sx.st.st_dev = filesystem_dev;
                if (inc_recurse) {