X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ad54dcc827451383222d1cf12d33038ba7f49447..82471e68a8bb3da8ca95f2b6564c330c52ce891e:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index bf5a1334..58a2f2c2 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -112,7 +112,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
 	char *p;
 
 	if (argc == 0 && !am_sender)
-		list_only = 1;
+		list_only |= 1;
 
 	if (*path == '/') {
 		rprintf(FERROR,
@@ -125,19 +125,6 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
 	if (!user)
 		user = getenv("LOGNAME");
 
-	/* set daemon_over_rsh to false since we need to build the
-	 * true set of args passed through the rsh/ssh connection;
-	 * this is a no-op for direct-socket-connection mode */
-	daemon_over_rsh = 0;
-	server_options(sargs, &sargc);
-
-	sargs[sargc++] = ".";
-
-	if (path && *path)
-		sargs[sargc++] = path;
-
-	sargs[sargc] = NULL;
-
 	io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
 
 	if (!read_line(f_in, line, sizeof line - 1)) {
@@ -154,6 +141,25 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
 	if (protocol_version > remote_protocol)
 		protocol_version = remote_protocol;
 
+	if (list_only && protocol_version >= 29)
+		list_only |= 2;
+
+	/* set daemon_over_rsh to false since we need to build the
+	 * true set of args passed through the rsh/ssh connection;
+	 * this is a no-op for direct-socket-connection mode */
+	daemon_over_rsh = 0;
+	server_options(sargs, &sargc);
+
+	sargs[sargc++] = ".";
+
+	if (path && *path)
+		sargs[sargc++] = path;
+
+	sargs[sargc] = NULL;
+
+	if (verbose > 1)
+		print_child_argv(sargs);
+
 	p = strchr(path,'/');
 	if (p) *p = 0;
 	io_printf(f_out, "%s\n", path);
@@ -479,7 +485,7 @@ static int rsync_module(int f_in, int f_out, int i)
 
 	if (lp_timeout(i)) {
 		io_timeout = lp_timeout(i);
-		if (io_timeout && io_timeout < select_timeout)
+		if (io_timeout < select_timeout)
 			select_timeout = io_timeout;
 	}
 
@@ -607,7 +613,7 @@ int daemon_main(void)
 
 	if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
 		rsync_port = RSYNC_PORT;
-	if (bind_address == NULL)
+	if (bind_address == NULL && *lp_bind_address())
 		bind_address = lp_bind_address();
 
 	log_init();