From f9bb8f76ee728bd1391a2b4890ce0281457a7bf2 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 25 Jul 2020 09:15:41 -0700 Subject: Change daemon variable & simplify some option code - Rename daemon_over_rsh -> daemon_connection since it is also used to indicate if a non-rsh daemon connection is active. - Move the daemon-over-rsh exception out of server_options() to the one caller that needs that behavior. - Don't allow noop_io_until_death() to be short-circuited when talking to a daemon over a socket, because it can't send errors via stderr. --- options.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'options.c') diff --git a/options.c b/options.c index 3e74a086..3304cbae 100644 --- a/options.c +++ b/options.c @@ -28,7 +28,6 @@ extern int module_id; extern int local_server; extern int sanitize_paths; -extern int daemon_over_rsh; extern unsigned int module_dirlen; extern struct name_num_obj valid_checksums; extern struct name_num_obj valid_compressions; @@ -2683,13 +2682,6 @@ void server_options(char **args, int *argc_p) /* This should always remain first on the server's command-line. */ args[ac++] = "--server"; - if (daemon_over_rsh > 0) { - args[ac++] = "--daemon"; - *argc_p = ac; - /* if we're passing --daemon, we're done */ - return; - } - if (!am_sender) args[ac++] = "--sender"; -- cgit v1.2.1