X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/daa598df119f67e96739a1bfcdf5d6ea75efee78..f746dda0a0022427eb1ef374f8f998b2153e50e5:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 305f6e61..c0e5d1aa 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -129,7 +129,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
 
 	sargs[sargc] = NULL;
 
-	io_printf(f_out, "@RSYNCD: %d\n", PROTOCOL_VERSION);
+	io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
 
 	if (!read_line(f_in, line, sizeof(line)-1)) {
 		rprintf(FERROR, "rsync: did not see server greeting\n");
@@ -192,7 +192,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
 	io_printf(f_out, "\n");
 
 	if (protocol_version < 23) {
-		if (protocol_version == 22 || (protocol_version > 17 && !am_sender))
+		if (protocol_version == 22 || !am_sender)
 			io_start_multiplex_in(f_in);
 	}
 
@@ -294,6 +294,8 @@ static int rsync_module(int f_in, int f_out, int i)
 	 * supplementary groups. */
 
 	exclude_path_prefix = use_chroot? "" : lp_path(i);
+	if (*exclude_path_prefix == '/' && !exclude_path_prefix[1])
+		exclude_path_prefix = "";
 
 	p = lp_include_from(i);
 	add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
@@ -330,14 +332,14 @@ static int rsync_module(int f_in, int f_out, int i)
 			return -1;
 		}
 
-		if (!push_dir("/", 0)) {
+		if (!push_dir("/")) {
 			rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i));
 			io_printf(f_out, "@ERROR: chdir failed\n");
 			return -1;
 		}
 
 	} else {
-		if (!push_dir(lp_path(i), 0)) {
+		if (!push_dir(lp_path(i))) {
 			rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i));
 			io_printf(f_out, "@ERROR: chdir failed\n");
 			return -1;
@@ -455,7 +457,7 @@ static int rsync_module(int f_in, int f_out, int i)
 #endif
 
 	if (protocol_version < 23) {
-		if (protocol_version == 22 || (protocol_version > 17 && am_sender))
+		if (protocol_version == 22 || am_sender)
 			io_start_multiplex_out(f_out);
 	}
 
@@ -520,7 +522,7 @@ int start_daemon(int f_in, int f_out)
 		set_nonblocking(f_in);
 	}
 
-	io_printf(f_out, "@RSYNCD: %d\n", PROTOCOL_VERSION);
+	io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
 
 	motd = lp_motd_file();
 	if (motd && *motd) {