X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/29bca53f9b6c020b5bd226b6378482a203fa7df3..b58f5e17ed35c68e10b88869d1e10d5378bd40e0:/main.c

diff --git a/main.c b/main.c
index 304f8be2..8ca164bd 100644
--- a/main.c
+++ b/main.c
@@ -41,7 +41,7 @@ extern int remove_source_files;
 extern int need_messages_from_generator;
 extern int kluge_around_eof;
 extern int do_stats;
-extern int log_got_error;
+extern int got_xfer_error;
 extern int module_id;
 extern int copy_links;
 extern int copy_dirlinks;
@@ -63,6 +63,7 @@ extern int read_batch;
 extern int write_batch;
 extern int batch_fd;
 extern int filesfrom_fd;
+extern int connect_timeout;
 extern pid_t cleanup_child_pid;
 extern struct stats stats;
 extern char *filesfrom_host;
@@ -1264,6 +1265,12 @@ static int start_client(int argc, char *argv[])
 		exit_cleanup(RERR_SYNTAX);
 	}
 
+	if (connect_timeout) {
+		rprintf(FERROR, "The --contimeout option may only be "
+				"used when connecting to an rsync daemon.\n");
+		exit_cleanup(RERR_SYNTAX);
+	}
+
 	if (shell_machine) {
 		p = strrchr(shell_machine,'@');
 		if (p) {
@@ -1310,7 +1317,7 @@ static RETSIGTYPE sigusr2_handler(UNUSED(int val))
 	if (!am_server)
 		output_summary();
 	close_all();
-	if (log_got_error)
+	if (got_xfer_error)
 		_exit(RERR_PARTIAL);
 	_exit(0);
 }