hint that a proxy can handle plain and ssl stream at the same time

[rsync.git] / pipe.c

diff --git a/pipe.c b/pipe.c
index 2326957df085dd7f78983eeaa3753d02e23390db..3e5f038b5d4538cfccad86ab2ec6dc6756db42ff 100644 (file)
--- a/pipe.c
+++ b/pipe.c
@@ -4,11 +4,11 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2020 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -27,7 +26,10 @@ extern int am_sender;
 extern int am_server;
 extern int blocking_io;
 extern int filesfrom_fd;
-extern mode_t orig_umask;
+extern int munge_symlinks;
+extern char *logfile_name;
+extern int remote_option_cnt;
+extern const char **remote_options;
 extern struct chmod_mode_struct *chmod_modes;
 
 /**
@@ -49,9 +51,8 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
        int to_child_pipe[2];
        int from_child_pipe[2];
 
-       if (verbose >= 2) {
-               print_child_argv(command);
-       }
+       if (DEBUG_GTE(CMD, 1))
+               print_child_argv("opening connection using:", command);
 
        if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
                rsyserr(FERROR, errno, "pipe");
@@ -65,10 +66,10 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
        }
 
        if (pid == 0) {
-               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
-                   close(to_child_pipe[1]) < 0 ||
-                   close(from_child_pipe[0]) < 0 ||
-                   dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
+               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0
+                || close(to_child_pipe[1]) < 0
+                || close(from_child_pipe[0]) < 0
+                || dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
                        rsyserr(FERROR, errno, "Failed to dup/close");
                        exit_cleanup(RERR_IPC);
                }
@@ -76,7 +77,6 @@ pid_t piped_child(char **command, int *f_in, int *f_out)
                        close(to_child_pipe[0]);
                if (from_child_pipe[1] != STDOUT_FILENO)
                        close(from_child_pipe[1]);
-               umask(orig_umask);
                set_blocking(STDIN_FILENO);
                if (blocking_io > 0)
                        set_blocking(STDOUT_FILENO);
@@ -116,8 +116,7 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
        /* The parent process is always the sender for a local rsync. */
        assert(am_sender);
 
-       if (fd_pair(to_child_pipe) < 0 ||
-           fd_pair(from_child_pipe) < 0) {
+       if (fd_pair(to_child_pipe) < 0 || fd_pair(from_child_pipe) < 0) {
                rsyserr(FERROR, errno, "pipe");
                exit_cleanup(RERR_IPC);
        }
@@ -132,12 +131,28 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                am_sender = 0;
                am_server = 1;
                filesfrom_fd = -1;
+               munge_symlinks = 0; /* Each side needs its own option. */
                chmod_modes = NULL; /* Let the sending side handle this. */
 
-               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0 ||
-                   close(to_child_pipe[1]) < 0 ||
-                   close(from_child_pipe[0]) < 0 ||
-                   dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
+               /* Let the client side handle this. */
+               if (logfile_name) {
+                       logfile_name = NULL;
+                       logfile_close();
+               }
+
+               if (remote_option_cnt) {
+                       int rc = remote_option_cnt + 1;
+                       const char **rv = remote_options;
+                       if (!parse_arguments(&rc, &rv)) {
+                               option_error();
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+               }
+
+               if (dup2(to_child_pipe[0], STDIN_FILENO) < 0
+                || close(to_child_pipe[1]) < 0
+                || close(from_child_pipe[0]) < 0
+                || dup2(from_child_pipe[1], STDOUT_FILENO) < 0) {
                        rsyserr(FERROR, errno, "Failed to dup/close");
                        exit_cleanup(RERR_IPC);
                }
@@ -145,11 +160,13 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
                        close(to_child_pipe[0]);
                if (from_child_pipe[1] != STDOUT_FILENO)
                        close(from_child_pipe[1]);
+#ifdef ICONV_CONST
+               setup_iconv();
+#endif
                child_main(argc, argv);
        }
 
-       if (close(from_child_pipe[1]) < 0 ||
-           close(to_child_pipe[0]) < 0) {
+       if (close(from_child_pipe[1]) < 0 || close(to_child_pipe[0]) < 0) {
                rsyserr(FERROR, errno, "Failed to close");
                exit_cleanup(RERR_IPC);
        }