X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d4c5cb2b0101299569dbbeeae08597c8300f92e7..9793bbb3646cbaa816d074dc925a4f4f7d40089f:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 47b29808..39a8cedf 100644 --- a/clientserver.c +++ b/clientserver.c @@ -56,7 +56,7 @@ 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; +extern struct filter_list_struct daemon_filter_list; extern char curr_dir[]; #ifdef ICONV_OPTION extern char *iconv_opt; @@ -532,25 +532,25 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host) set_filter_dir(module_dir, module_dirlen); p = lp_filter(i); - parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, - XFLG_ABS_IF_SLASH); + parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3); p = lp_include_from(i); - parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); + parse_filter_file(&daemon_filter_list, p, MATCHFLG_INCLUDE, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_include(i); - parse_rule(&server_filter_list, p, + parse_rule(&daemon_filter_list, p, MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES); p = lp_exclude_from(i); - parse_filter_file(&server_filter_list, p, 0, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); + parse_filter_file(&daemon_filter_list, p, 0, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS); p = lp_exclude(i); - parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT, - XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES); + parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT, + XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES); log_init(1);