Fixed local_child() so that the client side really does handle
authorWayne Davison <wayned@samba.org>
Mon, 4 Feb 2008 20:52:41 +0000 (12:52 -0800)
committerWayne Davison <wayned@samba.org>
Mon, 4 Feb 2008 20:52:41 +0000 (12:52 -0800)
the log-file writing.

pipe.c

diff --git a/pipe.c b/pipe.c
index 12aa73d7b1db417bff24fba79ccf5aa16a0c1d32..54458118933771fb1a604752fd2a06516a50d869 100644 (file)
--- 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");