One more tweak to the need_name_pipe logic.
authorWayne Davison <wayned@samba.org>
Wed, 23 Feb 2005 02:14:00 +0000 (02:14 +0000)
committerWayne Davison <wayned@samba.org>
Wed, 23 Feb 2005 02:14:00 +0000 (02:14 +0000)
main.c

diff --git a/main.c b/main.c
index 62a2b4d..5ff9924 100644 (file)
--- a/main.c
+++ b/main.c
@@ -49,6 +49,7 @@ extern int fuzzy_basis;
 extern int relative_paths;
 extern int rsync_port;
 extern int inplace;
+extern int make_backups;
 extern int whole_file;
 extern int read_batch;
 extern int write_batch;
@@ -499,7 +500,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        int status = 0;
        int error_pipe[2], name_pipe[2];
        BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis
-                           || inplace) && !dry_run;
+                           || (inplace && make_backups)) && !dry_run;
 
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */