A helper file for cleanup.c.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index c370e21..5e8ae52 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -15,9 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * 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.
  */
 
 #include "rsync.h"
@@ -39,10 +39,13 @@ extern int protocol_version;
 extern int io_timeout;
 extern int no_detach;
 extern int default_af_hint;
+extern int logfile_format_has_i;
+extern int logfile_format_has_o_or_i;
 extern mode_t orig_umask;
 extern char *bind_address;
 extern char *sockopts;
 extern char *config_file;
+extern char *logfile_format;
 extern char *files_from;
 extern char *tmpdir;
 extern struct chmod_mode_struct *chmod_modes;
@@ -50,8 +53,6 @@ extern struct filter_list_struct server_filter_list;
 
 char *auth_user;
 int read_only = 0;
-int daemon_log_format_has_i = 0;
-int daemon_log_format_has_o_or_i = 0;
 int module_id = -1;
 struct chmod_mode_struct *daemon_chmod_modes;
 
@@ -323,13 +324,12 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        if (lp_read_only(i))
                read_only = 1;
 
-       if (lp_transfer_logging(i)) {
-               if (log_format_has(lp_log_format(i), 'i'))
-                       daemon_log_format_has_i = 1;
-               if (daemon_log_format_has_i
-                   || log_format_has(lp_log_format(i), 'o'))
-                       daemon_log_format_has_o_or_i = 1;
-       }
+       if (lp_transfer_logging(i) && !logfile_format)
+               logfile_format = lp_log_format(i);
+       if (log_format_has(logfile_format, 'i'))
+               logfile_format_has_i = 1;
+       if (logfile_format_has_i || log_format_has(logfile_format, 'o'))
+               logfile_format_has_o_or_i = 1;
 
        am_root = (MY_UID() == 0);
 
@@ -389,7 +389,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
                   XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
 
-       log_init();
+       log_init(1);
 
 #ifdef HAVE_PUTENV
        if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
@@ -418,17 +418,18 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                                return -1;
                        }
                        if (pid) {
-                               char *ret1, *ret2;
+                               if (asprintf(&p, "RSYNC_PID=%ld", (long)pid) > 0)
+                                       putenv(p);
                                if (wait_process(pid, &status, 0) < 0)
                                        status = -1;
-                               if (asprintf(&ret1, "RSYNC_RAW_STATUS=%d", status) > 0)
-                                       putenv(ret1);
+                               if (asprintf(&p, "RSYNC_RAW_STATUS=%d", status) > 0)
+                                       putenv(p);
                                if (WIFEXITED(status))
                                        status = WEXITSTATUS(status);
                                else
                                        status = -1;
-                               if (asprintf(&ret2, "RSYNC_EXIT_STATUS=%d", status) > 0)
-                                       putenv(ret2);
+                               if (asprintf(&p, "RSYNC_EXIT_STATUS=%d", status) > 0)
+                                       putenv(p);
                                system(lp_postxfer_exec(i));
                                _exit(status);
                        }
@@ -438,6 +439,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                 * send us the user's request via a pipe. */
                if (*lp_prexfer_exec(i)) {
                        int fds[2];
+                       if (asprintf(&p, "RSYNC_PID=%ld", (long)getpid()) > 0)
+                               putenv(p);
                        if (pipe(fds) < 0 || (pre_exec_pid = fork()) < 0) {
                                rsyserr(FLOG, errno, "pre-xfer exec preparation failed");
                                io_printf(f_out, "@ERROR: pre-xfer exec preparation failed\n");
@@ -451,9 +454,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                                len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN);
                                if (len <= 0)
                                        _exit(1);
-                               if (asprintf(&p, "RSYNC_REQUEST=%s", buf) < 0)
-                                       out_of_memory("rsync_module");
-                               putenv(p);
+                               if (asprintf(&p, "RSYNC_REQUEST=%s", buf) > 0)
+                                       putenv(p);
                                for (j = 0; ; j++) {
                                        len = read_arg_from_pipe(fds[0], buf,
                                                                 BIGPATHBUFLEN);
@@ -462,9 +464,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                                                        break;
                                                _exit(1);
                                        }
-                                       if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) < 0)
-                                               out_of_memory("rsync_module");
-                                       putenv(p);
+                                       if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) > 0)
+                                               putenv(p);
                                }
                                close(fds[0]);
                                close(STDIN_FILENO);
@@ -502,7 +503,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        return -1;
                }
 
-               if (!push_dir("/")) {
+               if (!push_dir("/", 0)) {
                        rsyserr(FLOG, errno, "chdir %s failed\n",
                                lp_path(i));
                        io_printf(f_out, "@ERROR: chdir failed\n");
@@ -510,7 +511,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                }
 
        } else {
-               if (!push_dir(lp_path(i))) {
+               if (!push_dir(lp_path(i), 0)) {
                        rsyserr(FLOG, errno, "chdir %s failed\n",
                                lp_path(i));
                        io_printf(f_out, "@ERROR: chdir failed\n");
@@ -836,7 +837,7 @@ int daemon_main(void)
        if (bind_address == NULL && *lp_bind_address())
                bind_address = lp_bind_address();
 
-       log_init();
+       log_init(0);
 
        rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",
                RSYNC_VERSION, rsync_port);