From: Wayne Davison <wayned@samba.org>
Date: Sat, 31 Jul 2004 19:55:42 +0000 (+0000)
Subject: If we need to return an error during the startup phase and the other
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/bf4679e8a080ad6eb7cd7799ba09f8578da54c17

If we need to return an error during the startup phase and the other
side is expecting us to send them a files-from list, send the list
terminator before sending the error.
---

diff --git a/clientserver.c b/clientserver.c
index ac99ae4e..339c15d1 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -50,6 +50,7 @@ extern char *bind_address;
 extern struct exclude_list_struct server_exclude_list;
 extern char *exclude_path_prefix;
 extern char *config_file;
+extern char *files_from;
 
 char *auth_user;
 
@@ -461,6 +462,8 @@ static int rsync_module(int f_in, int f_out, int i)
 		 * get the error back to the client.  This means getting
 		 * the protocol setup finished first in later versions. */
 		setup_protocol(f_out, f_in);
+		if (files_from && !am_sender && strcmp(files_from, "-") != 0)
+			write_byte(f_out, 0);
 		io_start_multiplex_out();
 	}