[PATCH] Add forgotten setup_iconv() call so that daemon-side iconv works.

Matt McCutchen matt at mattmccutchen.net
Wed Jan 30 03:00:06 GMT 2008


---
I put the call after the "if (write_batch < 0) dry_run = 1;" test, just
as in main.  I think a single-use daemon will call both this setup_iconv
and the one in main, but I don't care: the one in main will have no
effect because the !am_server test will fail and the !iconv_opt return
will occur.

 clientserver.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/clientserver.c b/clientserver.c
index 1e3af63..19c2a25 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -703,6 +703,10 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 	if (write_batch < 0)
 		dry_run = 1;
 
+#ifdef ICONV_CONST
+	setup_iconv();
+#endif
+
 	if (lp_fake_super(i))
 		am_root = -1;
 	else if (am_root < 0) /* Treat --fake-super from client as --super. */
-- 
1.5.4.rc3.15.g4bbc



More information about the rsync mailing list