X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6f3684ffb5a772925a970ff61a01512fbb77da60..8e41b68e8f975c02a5d9281be780ba5d1a385107:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 5e8ae526..6d1da3e8 100644 --- a/clientserver.c +++ b/clientserver.c @@ -3,11 +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 + * 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, @@ -16,20 +16,21 @@ * 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" 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; @@ -50,13 +51,16 @@ extern char *files_from; extern char *tmpdir; extern struct chmod_mode_struct *chmod_modes; extern struct filter_list_struct server_filter_list; +extern char curr_dir[]; char *auth_user; int read_only = 0; int module_id = -1; struct chmod_mode_struct *daemon_chmod_modes; -/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */ +/* module_dirlen is the length of the module_dir string when in daemon + * mode, not chrooted, and the path is not "/"; otherwise 0. */ +char *module_dir = NULL; unsigned int module_dirlen = 0; #ifdef HAVE_SIGACTION @@ -109,7 +113,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 +209,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 +247,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 +345,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 +355,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; @@ -362,11 +371,22 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) /* TODO: Perhaps take a list of gids, and make them into the * supplementary groups. */ - if (use_chroot || (module_dirlen = strlen(lp_path(i))) == 1) { + /* We do a push_dir() without actually calling chdir() in order + * to make sure that the module's path is absolute. After this + * check, module_dir will be set to an absolute path. */ + module_dir = lp_path(i); + strlcpy(line, curr_dir, sizeof line); + if (!push_dir(module_dir, 1)) + goto chdir_failed; + if (strcmp(curr_dir, module_dir) != 0) + module_dir = strdup(curr_dir); + push_dir(line, 1); /* Restore curr_dir. */ + + if (use_chroot || (module_dirlen = strlen(module_dir)) == 1) { module_dirlen = 0; set_filter_dir("/", 1); } else - set_filter_dir(lp_path(i), module_dirlen); + set_filter_dir(module_dir, module_dirlen); p = lp_filter(i); parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, @@ -396,7 +416,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) char *modname, *modpath, *hostaddr, *hostname, *username; int status; if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 0 - || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", lp_path(i)) < 0 + || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", module_dir) < 0 || asprintf(&hostaddr, "RSYNC_HOST_ADDR=%s", addr) < 0 || asprintf(&hostname, "RSYNC_HOST_NAME=%s", host) < 0 || asprintf(&username, "RSYNC_USER_NAME=%s", auth_user) < 0) @@ -496,24 +516,17 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) * a warning, unless a "require chroot" flag is set, * in which case we fail. */ - if (chroot(lp_path(i))) { - rsyserr(FLOG, errno, "chroot %s failed", - lp_path(i)); + if (chroot(module_dir)) { + rsyserr(FLOG, errno, "chroot %s failed", module_dir); io_printf(f_out, "@ERROR: chroot failed\n"); return -1; } - - if (!push_dir("/", 0)) { - rsyserr(FLOG, errno, "chdir %s failed\n", - lp_path(i)); - io_printf(f_out, "@ERROR: chdir failed\n"); - return -1; - } - + if (!push_dir("/", 0)) + goto chdir_failed; } else { - if (!push_dir(lp_path(i), 0)) { - rsyserr(FLOG, errno, "chdir %s failed\n", - lp_path(i)); + if (!push_dir(module_dir, 0)) { + chdir_failed: + rsyserr(FLOG, errno, "chdir %s failed\n", module_dir); io_printf(f_out, "@ERROR: chdir failed\n"); return -1; } @@ -619,7 +632,14 @@ 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. */ + am_server = 1; /* Don't let someone try to be tricky. */ + if (lp_ignore_errors(module_id)) + ignore_errors = 1; + + if (lp_fake_super(i)) + am_root = -1; + else if (am_root < 0) /* Treat --fake-super from client as --super. */ + am_root = 2; if (filesfrom_fd == 0) filesfrom_fd = f_in; @@ -674,7 +694,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), 0); else option_error(); msleep(400);