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

diff --git a/clientserver.c b/clientserver.c
index 305f6e61..0e07da77 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -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);
@@ -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);
 	}