Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
93d6ca6
)
Moved the set_acl() call after the do_chmod() call again.
author
Wayne Davison
<wayned@samba.org>
Thu, 9 Mar 2006 19:50:49 +0000
(19:50 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 9 Mar 2006 19:50:49 +0000
(19:50 +0000)
acls.diff
patch
|
blob
|
blame
|
history
diff --git
a/acls.diff
b/acls.diff
index
dd73b7b
..
5fe5dd8
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-4948,9
+4948,9
@@
ACLs to a non-ACL-supporting disk should complain.
if (daemon_chmod_modes && !S_ISLNK(flist_mode))
cur_mode = tweak_mode(cur_mode, daemon_chmod_modes);
return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
if (daemon_chmod_modes && !S_ISLNK(flist_mode))
cur_mode = tweak_mode(cur_mode, daemon_chmod_modes);
return (flist_mode & ~CHMOD_BITS) | (cur_mode & CHMOD_BITS);
-@@ -203,6 +205,13 @@ int set_file_attrs(char *fname, struct f
- updated = 1;
+@@ -217,6 +219,13 @@ int set_file_attrs(char *fname, struct f
}
}
+ #endif
+#ifdef SUPPORT_ACLS
+ /* It's OK to call set_acl() now, even for a dir, as the generator
+#ifdef SUPPORT_ACLS
+ /* It's OK to call set_acl() now, even for a dir, as the generator
@@
-4959,9
+4959,9
@@
ACLs to a non-ACL-supporting disk should complain.
+ updated = 1;
+#endif
+
+ updated = 1;
+#endif
+
- #ifdef HAVE_CHMOD
- if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
-
int ret = do_chmod(fname, file->mode)
;
+ if (verbose > 1 && flags & ATTRS_REPORT) {
+ enum logcode code = daemon_log_format_has_i || dry_run
+
? FCLIENT : FINFO
;
--- old/rsync.h
+++ new/rsync.h
@@ -658,6 +658,20 @@ struct chmod_mode_struct;
--- old/rsync.h
+++ new/rsync.h
@@ -658,6 +658,20 @@ struct chmod_mode_struct;