Fix issue with earlier path-check (fixes "make check")
authorWayne Davison <wayned@samba.org>
Sun, 3 Dec 2017 23:49:56 +0000 (15:49 -0800)
committerWayne Davison <wayned@samba.org>
Mon, 4 Dec 2017 00:27:11 +0000 (16:27 -0800)
and make a BOOL more explicit.

checksum.c
receiver.c

index 4c9351ce278dc2f7bfa9db18f09a58c568ce010b..ad256350d85de03a35262ef06d99c51b2114d341 100644 (file)
@@ -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:
index 9c46242e013c4d447b17b00bbb705a96a5c92ed1..75cb00dc3678341ba08c3b9412fd296c75c2da98 100644 (file)
@@ -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)))