-/* -*- c-file-style: "linux"; -*-
+/*
+ * The socket based protocol for setting up a connection with rsyncd.
*
- * Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- * Copyright (C) 2001-2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006 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
* 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., 675 Mass Ave, Cambridge, MA 02139, 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.
*/
-/**
- * @file
- *
- * The socket based protocol for setting up a connection with
- * rsyncd.
- **/
-
#include "rsync.h"
extern int verbose;
+extern int quiet;
extern int list_only;
extern int am_sender;
extern int am_server;
extern int remote_protocol;
extern int protocol_version;
extern int io_timeout;
-extern int orig_umask;
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 struct filter_list_struct server_filter_list;
+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;
+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;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
-#define MAX_REQ_LEN (MAXPATHLEN + 255)
+#ifdef HAVE_SIGACTION
+static struct sigaction sigact;
+#endif
/**
* Run a client connected to an rsyncd. The alternative to this
if (fd == -1)
exit_cleanup(RERR_SOCKETIO);
+ set_socket_options(fd, sockopts);
+
ret = start_inband_exchange(user, path, fd, fd, argc);
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(char *user, char *path, int f_in, int f_out,
int argc)
{
int i;
return 0;
}
-static char *finish_pre_exec(pid_t pid, int fd, char *request)
+static char *finish_pre_exec(pid_t pid, int fd, char *request,
+ int argc, char *argv[])
{
- int status = -1;
+ int j, status = -1;
if (request) {
- int len = strlen(request);
- if (len > MAX_REQ_LEN)
- len = MAX_REQ_LEN;
- write(fd, request, len);
+ write_buf(fd, request, strlen(request)+1);
+ for (j = 0; j < argc; j++)
+ write_buf(fd, argv[j], strlen(argv[j])+1);
}
+
+ write_byte(fd, 0);
+
close(fd);
if (wait_process(pid, &status, 0) < 0
return NULL;
}
-static int rsync_module(int f_in, int f_out, int i)
+static int read_arg_from_pipe(int fd, char *buf, int limit)
+{
+ char *bp = buf, *eob = buf + limit - 1;
+
+ while (1) {
+ if (read(fd, bp, 1) != 1)
+ return -1;
+ if (*bp == '\0')
+ break;
+ if (bp < eob)
+ bp++;
+ }
+ *bp = '\0';
+
+ return bp - buf;
+}
+
+static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
{
int argc = 0;
int maxargs;
uid_t uid = (uid_t)-2; /* canonically "nobody" */
gid_t gid = (gid_t)-2;
char *p, *err_msg = NULL;
- char *addr = client_addr(f_in);
- char *host = client_name(f_in);
char *name = lp_name(i);
int use_chroot = lp_use_chroot(i);
int start_glob = 0;
if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
if (errno) {
rsyserr(FLOG, errno, "failed to open lock file %s",
- safe_fname(lp_lock_file(i)));
+ lp_lock_file(i));
io_printf(f_out, "@ERROR: failed to open lock file\n");
} else {
rprintf(FLOG, "max connections (%d) reached\n",
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;
+ 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);
return -1;
}
if (pre_exec_pid == 0) {
- char buf[MAX_REQ_LEN+1];
- int len;
+ char buf[BIGPATHBUFLEN];
+ int j, len;
close(fds[1]);
set_blocking(fds[0]);
- len = read(fds[0], buf, MAX_REQ_LEN);
- close(fds[0]);
+ len = read_arg_from_pipe(fds[0], buf, BIGPATHBUFLEN);
if (len <= 0)
_exit(1);
- buf[len] = '\0';
if (asprintf(&p, "RSYNC_REQUEST=%s", buf) < 0)
out_of_memory("rsync_module");
putenv(p);
+ for (j = 0; ; j++) {
+ len = read_arg_from_pipe(fds[0], buf,
+ BIGPATHBUFLEN);
+ if (len <= 0) {
+ if (!len)
+ break;
+ _exit(1);
+ }
+ if (asprintf(&p, "RSYNC_ARG%d=%s", j, buf) < 0)
+ out_of_memory("rsync_module");
+ putenv(p);
+ }
+ close(fds[0]);
close(STDIN_FILENO);
close(STDOUT_FILENO);
status = system(lp_prexfer_exec(i));
*/
if (chroot(lp_path(i))) {
rsyserr(FLOG, errno, "chroot %s failed",
- safe_fname(lp_path(i)));
+ lp_path(i));
io_printf(f_out, "@ERROR: chroot failed\n");
return -1;
}
if (!push_dir("/")) {
rsyserr(FLOG, errno, "chdir %s failed\n",
- safe_fname(lp_path(i)));
+ lp_path(i));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
} else {
if (!push_dir(lp_path(i))) {
rsyserr(FLOG, errno, "chdir %s failed\n",
- safe_fname(lp_path(i)));
+ lp_path(i));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
case 1:
if (pre_exec_pid) {
err_msg = finish_pre_exec(pre_exec_pid,
- pre_exec_fd, p);
+ pre_exec_fd, p,
+ argc, argv);
pre_exec_pid = 0;
}
request = strdup(p);
}
}
- if (pre_exec_pid)
- err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request);
+ if (pre_exec_pid) {
+ err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request,
+ argc, argv);
+ }
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 (filesfrom_fd == 0)
filesfrom_fd = f_in;
if (lp_timeout(i) && lp_timeout(i) > io_timeout)
set_io_timeout(lp_timeout(i));
+ /* If we have some incoming/outgoing chmod changes, append them to
+ * any user-specified changes (making our changes have priority).
+ * We also get a pointer to just our changes so that a receiver
+ * process can use them separately if --perms wasn't specified. */
+ if (am_sender)
+ p = lp_outgoing_chmod(i);
+ else
+ p = lp_incoming_chmod(i);
+ if (*p && !(daemon_chmod_modes = parse_chmod(p, &chmod_modes))) {
+ rprintf(FLOG, "Invalid \"%sing chmod\" directive: %s\n",
+ am_sender ? "outgo" : "incom", p);
+ }
+
start_server(f_in, f_out, argc, argv);
return 0;
int start_daemon(int f_in, int f_out)
{
char line[1024];
- char *motd;
+ char *motd, *addr, *host;
int i;
io_set_sock_fds(f_in, f_out);
+ /* We must load the config file before calling any function that
+ * might cause log-file output to occur. This ensures that the
+ * "log file" param gets honored for the 2 non-forked use-cases
+ * (when rsync is run by init and run by a remote shell). */
if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
- log_init();
+ addr = client_addr(f_in);
+ host = client_name(f_in);
+ rprintf(FLOG, "connect from %s (%s)\n", host, addr);
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");
- set_socket_options(f_in, lp_socket_options());
+ if (sockopts)
+ set_socket_options(f_in, sockopts);
+ else
+ set_socket_options(f_in, lp_socket_options());
set_nonblocking(f_in);
}
return -1;
if (!*line || strcmp(line, "#list") == 0) {
+ rprintf(FLOG, "module-list request from %s (%s)\n",
+ host, addr);
send_listing(f_out);
return -1;
}
}
if ((i = lp_number(line)) < 0) {
- char *addr = client_addr(f_in);
- char *host = client_name(f_in);
rprintf(FLOG, "unknown module '%s' tried from %s (%s)\n",
line, host, addr);
io_printf(f_out, "@ERROR: Unknown module '%s'\n", line);
return -1;
}
- return rsync_module(f_in, f_out, i);
+#ifdef HAVE_SIGACTION
+ sigact.sa_flags = SA_NOCLDSTOP;
+#endif
+ SIGACTION(SIGCHLD, remember_children);
+
+ return rsync_module(f_in, f_out, i, addr, host);
}
int daemon_main(void)
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
rsyserr(FLOG, errno, "failed to create pid file %s",
- safe_fname(pid_file));
+ pid_file);
exit_cleanup(RERR_FILEIO);
}
snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff