X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3e89da86dfb4a37aa00dcb55a1c9af46cff4b80f..47ba39bef6d69f9bf8107da9c97bdffc3e02476b:/options.c

diff --git a/options.c b/options.c
index 1ee4ee75..26dfd769 100644
--- a/options.c
+++ b/options.c
@@ -688,6 +688,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			files_from = alloc_sanitize_path(files_from, curr_dir);
 	}
 
+	if (daemon_opt) {
+		daemon_opt = 0;
+		am_daemon = 1;
+		return 1;
+	}
+
 	if (!backup_suffix)
 		backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
 	backup_suffix_len = strlen(backup_suffix);
@@ -707,9 +713,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			backup_dir_buf[backup_dir_len++] = '/';
 			backup_dir_buf[backup_dir_len] = '\0';
 		}
-		if (verbose > 1)
+		if (verbose > 1 && !am_sender)
 			rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
-	} else if (!backup_suffix_len) {
+	} else if (!backup_suffix_len && (!am_server || !am_sender)) {
 		rprintf(FERROR,
 			"--suffix cannot be a null string without --backup-dir\n");
 		exit_cleanup(RERR_SYNTAX);
@@ -750,9 +756,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		}
 	}
 
-	if (daemon_opt)
-		am_daemon = 1;
-
 	return 1;
 }