[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Mon May 30 09:21:09 MDT 2011


The branch, master has been updated
       via  cb0db58 Fix unwritable directory issue due to misordered chmod call.
      from  582aead Expand NO_ENTRY items from fake-super ACLs in get_rsync_acl().

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cb0db58fb30d05a8d050d22849aeb1b8f1507fbc
Author: Wayne Davison <wayned at samba.org>
Date:   Mon May 30 08:24:27 2011 -0700

    Fix unwritable directory issue due to misordered chmod call.

-----------------------------------------------------------------------

Summary of changes:
 generator.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generator.c b/generator.c
index 326ccd8..cd7abda 100644
--- a/generator.c
+++ b/generator.c
@@ -1354,6 +1354,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 		}
 
+#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.
 		 * This is then fixed after the transfer is done. */
@@ -1369,14 +1377,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 #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) {


-- 
The rsync repository.


More information about the rsync-cvs mailing list