From: Wayne Davison Date: Sun, 3 Dec 2017 23:49:56 +0000 (-0800) Subject: Fix issue with earlier path-check (fixes "make check") X-Git-Tag: v3.1.3pre1~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;p=thirdparty%2Frsync.git Fix issue with earlier path-check (fixes "make check") and make a BOOL more explicit. --- diff --git a/checksum.c b/checksum.c index 4c9351ce..ad256350 100644 --- a/checksum.c +++ b/checksum.c @@ -73,7 +73,7 @@ int parse_csum_name(const char *name, int len) exit_cleanup(RERR_UNSUPPORTED); } -int csum_len_for_type(int cst, int flist_csum) +int csum_len_for_type(int cst, BOOL flist_csum) { switch (cst) { case CSUM_NONE: diff --git a/receiver.c b/receiver.c index 9c46242e..75cb00dc 100644 --- a/receiver.c +++ b/receiver.c @@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name) file = dir_flist->files[cur_flist->parent_ndx]; fname = local_name ? local_name : f_name(file, fbuf); - if (daemon_filter_list.head - && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { + if (DEBUG_GTE(RECV, 1)) + rprintf(FINFO, "recv_files(%s)\n", fname); + + if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0') + && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); exit_cleanup(RERR_PROTOCOL); } - if (DEBUG_GTE(RECV, 1)) - rprintf(FINFO, "recv_files(%s)\n", fname); - #ifdef SUPPORT_XATTRS if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))