From: Wayne Davison <wayned@samba.org>
Date: Sat, 22 Jan 2005 20:28:17 +0000 (+0000)
Subject: Mustn't override a user-specified list_only value.
X-Git-Tag: v2.6.4pre1~378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8b3c05311b591e45fce024665335b5d4787ebe4;p=thirdparty%2Frsync.git

Mustn't override a user-specified list_only value.
---

diff --git a/main.c b/main.c
index b090f668..306673a5 100644
--- a/main.c
+++ b/main.c
@@ -730,7 +730,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 		exit_cleanup(status);
 	}
 
-	if (argc == 0)
+	if (argc == 0 && !list_only)
 		list_only = 1;
 
 	if (!read_batch)
@@ -962,9 +962,8 @@ static int start_client(int argc, char *argv[])
 	}
 
 	/* ... or no dest at all */
-	if (!am_sender && argc == 0) {
+	if (!am_sender && argc == 0 && !list_only)
 		list_only = 1;
-	}
 
 	pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,
 		     &f_in,&f_out);