Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d8639e
)
Added a comment.
author
Wayne Davison
<wayned@samba.org>
Tue, 21 Feb 2006 00:29:55 +0000
(
00:29
+0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 21 Feb 2006 00:29:55 +0000
(
00:29
+0000)
clientserver.c
patch
|
blob
|
blame
|
history
diff --git
a/clientserver.c
b/clientserver.c
index
eb64456
..
f55117c
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-690,6
+690,10
@@
static int rsync_module(int f_in, int f_out, int i)
if (lp_timeout(i) && lp_timeout(i) > io_timeout)
set_io_timeout(lp_timeout(i));
+ /* If we have some incoming/outgoing chmod changes, append them to
+ * any user-specified changes (making our changes have priority).
+ * We also get a pointer to just our changes so that a receiver
+ * process can use them separately if --perms wasn't specified. */
if (am_sender)
p = lp_outgoing_chmod(i);
else