extern int am_server;
extern int am_daemon;
extern int am_root;
-extern int module_id;
-extern int read_only;
extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
extern int remote_protocol;
extern int protocol_version;
extern int io_timeout;
+extern int select_timeout;
extern int orig_umask;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
-extern struct exclude_list_struct server_exclude_list;
-extern char *exclude_path_prefix;
+extern struct filter_list_struct server_filter_list;
extern char *config_file;
+extern char *files_from;
char *auth_user;
+int read_only = 0;
+int module_id = -1;
+
+/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
+unsigned int module_dirlen = 0;
/**
* Run a client connected to an rsyncd. The alternative to this
*p = '\0';
}
+ if (rsync_port == 0)
+ rsync_port = RSYNC_PORT;
+
fd = open_socket_out_wrapped(host, rsync_port, bind_address,
default_af_hint);
if (fd == -1)
return ret < 0? ret : client_run(fd, fd, -1, argc, argv);
}
-int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
+int start_inband_exchange(char *user, char *path, int f_in, int f_out,
+ int argc)
{
int i;
char *sargs[MAX_ARGS];
char *p;
if (argc == 0 && !am_sender)
- list_only = 1;
+ list_only |= 1;
if (*path == '/') {
rprintf(FERROR,
if (!user)
user = getenv("LOGNAME");
- /* set daemon_over_rsh to false since we need to build the
- * true set of args passed through the rsh/ssh connection;
- * this is a no-op for direct-socket-connection mode */
- daemon_over_rsh = 0;
- server_options(sargs, &sargc);
-
- sargs[sargc++] = ".";
-
- if (path && *path)
- sargs[sargc++] = path;
-
- sargs[sargc] = NULL;
-
io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
if (!read_line(f_in, line, sizeof line - 1)) {
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
+ if (list_only && protocol_version >= 29)
+ list_only |= 2;
+
+ /* set daemon_over_rsh to false since we need to build the
+ * true set of args passed through the rsh/ssh connection;
+ * this is a no-op for direct-socket-connection mode */
+ daemon_over_rsh = 0;
+ server_options(sargs, &sargc);
+
+ sargs[sargc++] = ".";
+
+ if (path && *path)
+ sargs[sargc++] = path;
+
+ sargs[sargc] = NULL;
+
+ if (verbose > 1)
+ print_child_argv(sargs);
+
p = strchr(path,'/');
if (p) *p = 0;
io_printf(f_out, "%s\n", path);
if (protocol_version < 23) {
if (protocol_version == 22 || !am_sender)
- io_start_multiplex_in(f_in);
+ io_start_multiplex_in();
}
return 0;
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FLOG, "rsync denied on module %s from %s (%s)\n",
name, host, addr);
- io_printf(f_out, "@ERROR: access denied to %s from %s (%s)\n",
- name, host, addr);
+ if (!lp_list(i))
+ io_printf(f_out, "@ERROR: Unknown module '%s'\n", name);
+ else {
+ io_printf(f_out,
+ "@ERROR: access denied to %s from %s (%s)\n",
+ name, host, addr);
+ }
return -1;
}
if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
if (errno) {
rsyserr(FLOG, errno, "failed to open lock file %s",
- lp_lock_file(i));
- io_printf(f_out, "@ERROR: failed to open lock file %s\n",
- lp_lock_file(i));
+ safe_fname(lp_lock_file(i)));
+ io_printf(f_out, "@ERROR: failed to open lock file\n");
} else {
rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i));
- io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+ io_printf(f_out, "@ERROR: max connections (%d) reached -- try again later\n",
lp_max_connections(i));
}
return -1;
module_id = i;
+ if (lp_read_only(i))
+ read_only = 1;
+
am_root = (MY_UID() == 0);
if (am_root) {
/* TODO: Perhaps take a list of gids, and make them into the
* supplementary groups. */
- exclude_path_prefix = use_chroot? "" : lp_path(i);
- if (*exclude_path_prefix == '/' && !exclude_path_prefix[1])
- exclude_path_prefix = "";
+ if (use_chroot) {
+ module_dirlen = 0;
+ set_filter_dir("/", 1);
+ } else {
+ module_dirlen = strlen(lp_path(i));
+ set_filter_dir(lp_path(i), module_dirlen);
+ }
+
+ p = lp_filter(i);
+ parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS);
p = lp_include_from(i);
- add_exclude_file(&server_exclude_list, p,
- XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
+ parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
- add_exclude(&server_exclude_list, p,
- XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
+ parse_rule(&server_filter_list, p,
+ MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
- add_exclude_file(&server_exclude_list, p,
- XFLG_FATAL_ERRORS);
+ parse_filter_file(&server_filter_list, p, 0,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
-
- exclude_path_prefix = NULL;
+ parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
log_init();
* in which case we fail.
*/
if (chroot(lp_path(i))) {
- rsyserr(FLOG, errno, "chroot %s failed", lp_path(i));
+ rsyserr(FLOG, errno, "chroot %s failed",
+ safe_fname(lp_path(i)));
io_printf(f_out, "@ERROR: chroot failed\n");
return -1;
}
if (!push_dir("/")) {
- rsyserr(FLOG, errno, "chdir %s failed\n", lp_path(i));
+ rsyserr(FLOG, errno, "chdir %s failed\n",
+ safe_fname(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", lp_path(i));
+ rsyserr(FLOG, errno, "chdir %s failed\n",
+ safe_fname(lp_path(i)));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
-#ifdef HAVE_SETGROUPS
+#if HAVE_SETGROUPS
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(1, &gid)) {
start_glob = 1;
}
+ verbose = 0; /* future verbosity is controlled by client options */
argp = argv;
ret = parse_arguments(&argc, (const char ***) &argp, 0);
if (protocol_version < 23
&& (protocol_version == 22 || am_sender))
- io_start_multiplex_out(f_out);
+ io_start_multiplex_out();
else if (!ret) {
/* We have to get I/O multiplexing started so that we can
* get the error back to the client. This means getting
* the protocol setup finished first in later versions. */
setup_protocol(f_out, f_in);
- io_start_multiplex_out(f_out);
+ if (files_from && !am_sender && strcmp(files_from, "-") != 0)
+ write_byte(f_out, 0);
+ io_start_multiplex_out();
}
if (!ret) {
exit_cleanup(RERR_UNSUPPORTED);
}
- if (lp_timeout(i))
+ if (lp_timeout(i)) {
io_timeout = lp_timeout(i);
+ if (io_timeout < select_timeout)
+ select_timeout = io_timeout;
+ }
start_server(f_in, f_out, argc, argp);
int n = lp_numservices();
int i;
- for (i = 0; i < n; i++)
+ for (i = 0; i < n; i++) {
if (lp_list(i))
io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
+ }
if (protocol_version >= 25)
io_printf(fd,"@RSYNCD: EXIT\n");
{
char line[200];
char *motd;
- int i = -1;
+ int i;
+
+ io_set_sock_fds(f_in, f_out);
if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
if (protocol_version > remote_protocol)
protocol_version = remote_protocol;
- while (i == -1) {
- line[0] = 0;
- if (!read_line(f_in, line, sizeof line - 1))
- return -1;
+ line[0] = 0;
+ if (!read_line(f_in, line, sizeof line - 1))
+ return -1;
- if (!*line || strcmp(line,"#list") == 0) {
- send_listing(f_out);
- return -1;
- }
+ if (!*line || strcmp(line, "#list") == 0) {
+ send_listing(f_out);
+ return -1;
+ }
- if (*line == '#') {
- /* it's some sort of command that I don't understand */
- io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
- return -1;
- }
+ if (*line == '#') {
+ /* it's some sort of command that I don't understand */
+ io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
+ return -1;
+ }
- i = lp_number(line);
- if (i == -1) {
- io_printf(f_out, "@ERROR: Unknown module '%s'\n", line);
- 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);
if (!lp_load(config_file, 1))
exit_cleanup(RERR_SYNTAX);
+ if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
+ rsync_port = RSYNC_PORT;
+ if (bind_address == NULL && *lp_bind_address())
+ bind_address = lp_bind_address();
+
log_init();
rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n",
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
- rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
+ rsyserr(FLOG, errno, "failed to create pid file %s",
+ safe_fname(pid_file));
exit_cleanup(RERR_FILEIO);
}
snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff