X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/164cb66addee693700c70fed63d996872fcc3edb..d552250fbbd50e5ff2cd361d6218793b14e8cbc6:/main.c

diff --git a/main.c b/main.c
index 6881c8e6..0f160067 100644
--- a/main.c
+++ b/main.c
@@ -469,7 +469,7 @@ static pid_t do_cmd(char *cmd, char *machine, char *user, char **remote_argv, in
 #ifdef ICONV_CONST
 		setup_iconv();
 #endif
-		if (protect_args)
+		if (protect_args && !daemon_over_rsh)
 			send_protected_args(*f_out_p, args);
 	}
 
@@ -1187,8 +1187,8 @@ static int start_client(int argc, char *argv[])
 			rprintf(FERROR, "remote destination is not allowed with --read-batch\n");
 			exit_cleanup(RERR_SYNTAX);
 		}
-		remote_argv = argv + argc - 1;
-		remote_argc = 1;
+		remote_argv = argv += argc - 1;
+		remote_argc = argc = 1;
 	}
 
 	if (am_sender) {