summaryrefslogtreecommitdiff
path: root/generator.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-09-12 09:27:07 -0700
committerWayne Davison <wayned@samba.org>2009-09-12 09:27:07 -0700
commitee1c00fea8647356e403368fad9ad4c909e9ef08 (patch)
treeeae7a614d05e6ca49d0244bf7f337302f8cb58ff /generator.c
parent1b502f3ec234bf1045c6bb146f64734d09e81956 (diff)
downloadrsync-ee1c00fea8647356e403368fad9ad4c909e9ef08.tar.gz
rsync-ee1c00fea8647356e403368fad9ad4c909e9ef08.tar.bz2
rsync-ee1c00fea8647356e403368fad9ad4c909e9ef08.zip
Pass "new_mode" to set_acl() and change its return values.
Diffstat (limited to 'generator.c')
-rw-r--r--generator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generator.c b/generator.c
index 836633e8..acf4b888 100644
--- a/generator.c
+++ b/generator.c
@@ -417,7 +417,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fname, sxp);
- if (set_acl(NULL, file, sxp) == 0)
+ if (set_acl(NULL, file, sxp, file->mode))
return 0;
}
#endif
@@ -476,7 +476,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fnamecmp, sxp);
- if (set_acl(NULL, file, sxp) == 0)
+ if (set_acl(NULL, file, sxp, file->mode))
iflags |= ITEM_REPORT_ACL;
}
#endif