Add safety check for local --remove-source-files.

[rsync.git] / main.c

diff --git a/main.c b/main.c
index fa263d27d18adf5321dfc75aa1781027a0797967..9ebfbea72fa3441c6a54a2f930017b99e5fac3fd 100644 (file)
--- a/main.c
+++ b/main.c
@@ -89,7 +89,6 @@ extern int backup_dir_len;
 extern int basis_dir_cnt;
 extern int default_af_hint;
 extern int stdout_format_has_i;
-extern int trust_sender_filter;
 extern struct stats stats;
 extern char *stdout_format;
 extern char *logfile_format;
@@ -636,7 +635,6 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
 #ifdef ICONV_CONST
                setup_iconv();
 #endif
-               trust_sender_filter = 1;
        } else if (local_server) {
                /* If the user didn't request --[no-]whole-file, force
                 * it on, but only if we're not batch processing. */
@@ -1504,7 +1502,7 @@ static int start_client(int argc, char *argv[])
                int dummy_port = rsync_port;
                int i;
                if (filesfrom_fd < 0)
-                       add_implied_include(remote_argv[0]);
+                       add_implied_include(remote_argv[0], daemon_connection);
                /* For remote source, any extra source args must have either
                 * the same hostname or an empty hostname. */
                for (i = 1; i < remote_argc; i++) {
@@ -1528,7 +1526,7 @@ static int start_client(int argc, char *argv[])
                        if (!rsync_port && !*arg) /* Turn an empty arg into a dot dir. */
                                arg = ".";
                        remote_argv[i] = arg;
-                       add_implied_include(arg);
+                       add_implied_include(arg, daemon_connection);
                }
        }