extern struct exclude_list_struct server_exclude_list;
extern char *exclude_path_prefix;
extern char *config_file;
+extern char *files_from;
char *auth_user;
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];
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 (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) {
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);