X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f05c80119448c117dfdeaf0a4eb6d174ce5d5f55..327c559aff771314cef19d9485d317a08283da01:/main.c

diff --git a/main.c b/main.c
index 9a1bec0f..76692e1b 100644
--- a/main.c
+++ b/main.c
@@ -68,6 +68,7 @@ extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
+extern char *password_file;
 extern char curr_dir[MAXPATHLEN];
 extern struct filter_list_struct server_filter_list;
 
@@ -1130,6 +1131,12 @@ static int start_client(int argc, char *argv[])
 		}
 	}
 
+	if (password_file && !daemon_over_rsh) {
+		rprintf(FERROR, "The --password-file option may only be "
+				"used when accessing an rsync daemon.\n");
+		exit_cleanup(RERR_SYNTAX);
+	}
+
 	if (shell_machine) {
 		p = strrchr(shell_machine,'@');
 		if (p) {
@@ -1360,6 +1367,9 @@ int main(int argc,char *argv[])
 		}
 		if (read_batch)
 			read_stream_flags(batch_fd);
+		else
+			write_stream_flags(batch_fd);
+
 	}
 	if (write_batch < 0)
 		dry_run = 1;