Avoid forwarding the --temp-dir option to the server when we're

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 1c2cf33..bbec3e8 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1262,7 +1262,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                snprintf(err_buf, sizeof err_buf,
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
-       } else if (delete_mode && !delete_excluded) {
+       } else if (make_backups && delete_mode && !delete_excluded) {
                snprintf(backup_dir_buf, sizeof backup_dir_buf,
                        "P *%s", backup_suffix);
                parse_rule(&filter_list, backup_dir_buf, 0, 0);
@@ -1684,7 +1684,7 @@ void server_options(char **args,int *argc)
        else if (inplace)
                args[ac++] = "--inplace";
 
-       if (tmpdir) {
+       if (tmpdir && am_sender) {
                args[ac++] = "--temp-dir";
                args[ac++] = tmpdir;
        }