#include "rsync.h"
extern int verbose;
+extern int quiet;
extern int list_only;
extern int am_sender;
extern int am_server;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
-extern struct filter_list_struct server_filter_list;
+extern char *sockopts;
extern char *config_file;
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)
-
/**
* Run a client connected to an rsyncd. The alternative to this
* function for remote-shell connections is do_cmd().
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);
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 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)
{
int argc = 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",
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 (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;
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) {
+ char *addr = client_addr(f_in);
+ char *host = client_name(f_in);
+ rprintf(FLOG, "module-list request from %s (%s)\n",
+ host, addr);
send_listing(f_out);
return -1;
}
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