X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a6653bc6c49c4457f6e2771492f30216ac3646a..8840ec0f49157bc390b3dda5467287a0290ac4f1:/clientserver.c diff --git a/clientserver.c b/clientserver.c index b3d3ceb2..3b53958f 100644 --- a/clientserver.c +++ b/clientserver.c @@ -58,6 +58,7 @@ 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; @@ -685,12 +686,11 @@ static int rsync_module(int f_in, int f_out, int i) 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 && !parse_chmod(p, &chmod_modes)) { + if (*p && !(daemon_chmod_modes = parse_chmod(p, &chmod_modes))) { rprintf(FLOG, "Invalid \"%sing chmod\" directive: %s\n", am_sender ? "outgo" : "incom", p); } @@ -773,6 +773,10 @@ int start_daemon(int f_in, int f_out) 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; }