Commit 77812418 authored by Wayne Davison's avatar Wayne Davison

Make missing args governed by protect filters, not hide.

parent b5473dd4
...@@ -2189,7 +2189,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) ...@@ -2189,7 +2189,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
} }
/* A dot-dir should not be excluded! */ /* A dot-dir should not be excluded! */
if (name_type != DOTDIR_NAME if (name_type != DOTDIR_NAME && st.st_mode != 0
&& is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, ALL_FILTERS)) && is_excluded(fbuf, S_ISDIR(st.st_mode) != 0, ALL_FILTERS))
continue; continue;
......
...@@ -97,7 +97,7 @@ extern mode_t orig_umask; ...@@ -97,7 +97,7 @@ extern mode_t orig_umask;
extern uid_t our_uid; extern uid_t our_uid;
extern char *basis_dir[MAX_BASIS_DIRS+1]; extern char *basis_dir[MAX_BASIS_DIRS+1];
extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list; extern struct filter_list_struct filter_list, daemon_filter_list;
int maybe_ATTRS_REPORT = 0; int maybe_ATTRS_REPORT = 0;
...@@ -1178,6 +1178,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, ...@@ -1178,6 +1178,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
} }
if (delete_missing_args && file->mode == 0) { if (delete_missing_args && file->mode == 0) {
if (filter_list.head && check_filter(&filter_list, FINFO, fname, is_dir) < 0)
return;
if (statret == 0) if (statret == 0)
delete_item(fname, sx.st.st_mode, del_opts); delete_item(fname, sx.st.st_mode, del_opts);
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment