From ddc8110dea7ee78eb03855854497076cefe7284d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 4 Feb 2008 12:52:41 -0800 Subject: [PATCH] Fixed local_child() so that the client side really does handle the log-file writing. --- pipe.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pipe.c b/pipe.c index 12aa73d7..54458118 100644 --- a/pipe.c +++ b/pipe.c @@ -133,6 +133,12 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out, filesfrom_fd = -1; chmod_modes = NULL; /* Let the sending side handle this. */ + /* Let the client side handle this. */ + if (logfile_name) { + logfile_name = NULL; + logfile_close(); + } + if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 || close(to_child_pipe[1]) < 0 || close(from_child_pipe[0]) < 0 || @@ -150,12 +156,6 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out, child_main(argc, argv); } - /* Let the client side handle this. */ - if (logfile_name) { - logfile_name = NULL; - logfile_close(); - } - if (close(from_child_pipe[1]) < 0 || close(to_child_pipe[0]) < 0) { rsyserr(FERROR, errno, "Failed to close"); -- 2.34.1