From: Wayne Davison <wayned@samba.org>
Date: Sat, 5 Sep 2009 16:40:53 +0000 (-0700)
Subject: Fix daemon's conveyance of io_error value from sender.
X-Git-Tag: v3.0.7pre1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebbab3788faac02d8eb8d34170c9188694d52ab7;p=thirdparty%2Frsync.git

Fix daemon's conveyance of io_error value from sender.
---

diff --git a/sender.c b/sender.c
index e0b440de..59dae7dd 100644
--- a/sender.c
+++ b/sender.c
@@ -173,6 +173,7 @@ void send_files(int f_in, int f_out)
 	int itemizing = am_server ? logfile_format_has_i : stdout_format_has_i;
 	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
 	int f_xfer = write_batch < 0 ? batch_fd : f_out;
+	int save_io_error = io_error;
 	int ndx, j;
 
 	if (verbose > 2)
@@ -361,6 +362,9 @@ void send_files(int f_in, int f_out)
 	if (make_backups < 0)
 		make_backups = -make_backups;
 
+	if (io_error != save_io_error && protocol_version >= 30)
+		send_msg_int(MSG_IO_ERROR, io_error);
+
 	if (verbose > 2)
 		rprintf(FINFO, "send files finished\n");