X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/10ae3406ee77bbb8c8d4c1212490f00e6376d08b..ba2133d6add082b059728074febdac6c520a4351:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 478e6cb9..786c4bed 100644 --- a/clientserver.c +++ b/clientserver.c @@ -3,12 +3,11 @@ * * Copyright (C) 1998-2001 Andrew Tridgell * Copyright (C) 2001-2002 Martin Pool - * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2002-2007 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 - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,12 +23,14 @@ extern int verbose; extern int quiet; +extern int output_motd; extern int list_only; extern int am_sender; extern int am_server; extern int am_daemon; extern int am_root; extern int rsync_port; +extern int ignore_errors; extern int kluge_around_eof; extern int daemon_over_rsh; extern int sanitize_paths; @@ -109,7 +110,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) return ret ? ret : client_run(fd, fd, -1, argc, argv); } -int start_inband_exchange(char *user, char *path, int f_in, int f_out, +int start_inband_exchange(const char *user, char *path, int f_in, int f_out, int argc) { int i; @@ -205,7 +206,10 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, return -1; } - rprintf(FINFO, "%s\n", line); + /* This might be a MOTD line or a module listing, but there is + * no way to differentiate it. The manpage mentions this. */ + if (output_motd) + rprintf(FINFO, "%s\n", line); } kluge_around_eof = 0; @@ -240,7 +244,9 @@ static char *finish_pre_exec(pid_t pid, int fd, char *request, if (wait_process(pid, &status, 0) < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { char *e; - if (asprintf(&e, "pre-xfer exec returned failure (%d)\n", status) < 0) + if (asprintf(&e, "pre-xfer exec returned failure (%d)%s%s\n", + status, status < 0 ? ": " : "", + status < 0 ? strerror(errno) : "") < 0) out_of_memory("finish_pre_exec"); return e; } @@ -336,7 +342,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) if (am_root) { p = lp_uid(i); if (!name_to_uid(p, &uid)) { - if (!isdigit(*(unsigned char *)p)) { + if (!isDigit(p)) { rprintf(FLOG, "Invalid uid %s\n", p); io_printf(f_out, "@ERROR: invalid uid %s\n", p); return -1; @@ -346,7 +352,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) p = lp_gid(i); if (!name_to_gid(p, &gid)) { - if (!isdigit(*(unsigned char *)p)) { + if (!isDigit(p)) { rprintf(FLOG, "Invalid gid %s\n", p); io_printf(f_out, "@ERROR: invalid gid %s\n", p); return -1; @@ -389,7 +395,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 +424,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 +445,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 +460,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 +470,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 +509,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 +517,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"); @@ -619,6 +626,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) verbose = 0; /* future verbosity is controlled by client options */ ret = parse_arguments(&argc, (const char ***) &argv, 0); quiet = 0; /* Don't let someone try to be tricky. */ + if (lp_ignore_errors(module_id)) + ignore_errors = 1; if (filesfrom_fd == 0) filesfrom_fd = f_in; @@ -673,7 +682,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) if (!ret || err_msg) { if (err_msg) - rprintf(FERROR, err_msg); + rwrite(FERROR, err_msg, strlen(err_msg)); else option_error(); msleep(400); @@ -836,7 +845,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);