If the user specified --password-file without using daemon mode,

complain and die.

1 files changed, 7 insertions, 0 deletions

diff --git a/main.c b/main.c
index 6d58dd8c..fccf627b 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 is used for "
+				"talking to an rsync daemon.\n");
+		exit_cleanup(RERR_SYNTAX);
+	}
+
 	if (shell_machine) {
 		p = strrchr(shell_machine,'@');
 		if (p) {