int preserve_links = 0;
int preserve_hard_links = 0;
int preserve_acls = 0;
-@@ -352,6 +353,7 @@ void usage(enum logcode F)
+@@ -366,6 +367,7 @@ void usage(enum logcode F)
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
-@@ -549,6 +551,7 @@ static struct poptOption long_options[]
+@@ -567,6 +569,7 @@ static struct poptOption long_options[]
{"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1802,6 +1805,9 @@ void server_options(char **args,int *arg
- args[ac++] = tmpdir;
- }
+@@ -1869,6 +1872,9 @@ void server_options(char **args,int *arg
+ args[ac++] = tmpdir;
+ }
-+ if (do_fsync && am_sender)
-+ args[ac++] = "--fsync";
++ if (do_fsync)
++ args[ac++] = "--fsync";
+
- if (basis_dir[0] && am_sender) {
- /* the server only needs this option if it is not the sender,
- * and it may be an older version that doesn't know this
+ if (basis_dir[0]) {
+ /* the server only needs this option if it is not the sender,
+ * and it may be an older version that doesn't know this
--- old/receiver.c
+++ new/receiver.c
@@ -39,6 +39,7 @@ extern int relative_paths;