X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/da3478b2a7b0a15f9815dbc3463b98e7249422cc..dce70db374f130fe001e0af478e07da3608384b8:/main.c

diff --git a/main.c b/main.c
index c41e2245..085e5785 100644
--- a/main.c
+++ b/main.c
@@ -392,7 +392,7 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 			(long)getpid());
 	}
 
-	if (am_daemon && lp_write_only(module_id) && am_sender) {
+	if (am_daemon && lp_write_only(module_id)) {
 		rprintf(FERROR, "ERROR: module is write only\n");
 		exit_cleanup(RERR_SYNTAX);
 		return;
@@ -529,7 +529,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 			argc, (long)getpid());
 	}
 
-	if (am_daemon && lp_read_only(module_id) && !am_sender) {
+	if (am_daemon && lp_read_only(module_id)) {
 		rprintf(FERROR,"ERROR: module is read only\n");
 		exit_cleanup(RERR_SYNTAX);
 		return;
@@ -1020,11 +1020,8 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
 int main(int argc,char *argv[])
 {
 	int ret;
-	int orig_argc;
-	char **orig_argv;
-
-	orig_argc = argc;
-	orig_argv = argv;
+	int orig_argc = argc;
+	char **orig_argv = argv;
 
 	signal(SIGUSR1, sigusr1_handler);
 	signal(SIGUSR2, sigusr2_handler);
@@ -1075,7 +1072,7 @@ int main(int argc,char *argv[])
 
 	if (write_batch || read_batch) {
 		if (write_batch)
-			write_batch_argvs_file(orig_argc, orig_argv);
+			write_batch_shell_file(orig_argc, orig_argv, argc);
 
 		if (read_batch && strcmp(batch_name, "-") == 0)
 			batch_fd = STDIN_FILENO;