summaryrefslogtreecommitdiff
path: root/options.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2014-06-08 10:22:09 -0700
committerWayne Davison <wayned@samba.org>2014-06-08 10:42:14 -0700
commitff08acd4f24e74019dd75420fd8373fad563c1af (patch)
treedd08d095b23b7e5a075d731ecc7829789756de93 /options.c
parent03bb593f812ac0a1c4a6b38d333e31f149f3a451 (diff)
downloadrsync-ff08acd4f24e74019dd75420fd8373fad563c1af.tar.gz
rsync-ff08acd4f24e74019dd75420fd8373fad563c1af.tar.bz2
rsync-ff08acd4f24e74019dd75420fd8373fad563c1af.zip
Added a flag to disable xattr hlink optimization.
I added a compatibility flag for protocol 31 that will let both sides know if they should be using the xattr optimization that attempted to avoid sending xattr info for hardlinked files. Since this optimization was causing some issues, this compatibility flag will ensure that both sides know if they should be trying to use the optimization or not.
Diffstat (limited to 'options.c')
-rw-r--r--options.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/options.c b/options.c
index 0aa64bf0..5b061ade 100644
--- a/options.c
+++ b/options.c
@@ -2494,12 +2494,13 @@ void server_options(char **args, int *argc_p)
if (allow_inc_recurse)
argstr[x++] = 'i';
#ifdef CAN_SET_SYMLINK_TIMES
- argstr[x++] = 'L';
+ argstr[x++] = 'L'; /* symlink time-setting support */
#endif
#ifdef ICONV_OPTION
- argstr[x++] = 's';
+ argstr[x++] = 's'; /* symlink iconv translation support */
#endif
- argstr[x++] = 'f';
+ argstr[x++] = 'f'; /* flist I/O-error safety support */
+ argstr[x++] = 'x'; /* xattr hardlink optimization not supported */
}
if (x >= (int)sizeof argstr) { /* Not possible... */