diff options
| author | Wayne Davison <wayned@samba.org> | 2010-06-04 23:10:47 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2010-06-04 23:10:47 -0700 |
| commit | 11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9 (patch) | |
| tree | cad19227cb217033c3244a82e355d443f2d42546 | |
| parent | fe2c582af879a633c346d0c36da3ca79f5d7ff3b (diff) | |
| download | android_external_rsync-11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9.tar.gz android_external_rsync-11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9.tar.bz2 android_external_rsync-11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9.zip | |
Fix daemon-filter crash issue (bug 7489).
| -rw-r--r-- | generator.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generator.c b/generator.c index 9f3586ff..11854cc4 100644 --- a/generator.c +++ b/generator.c @@ -1300,6 +1300,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, skip_dir = NULL; } +#ifdef SUPPORT_ACLS + sx.acc_acl = sx.def_acl = NULL; +#endif +#ifdef SUPPORT_XATTRS + sx.xattr = NULL; +#endif if (daemon_filter_list.head && (*fname != '.' || fname[1])) { if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) { if (is_dir < 0) @@ -1317,12 +1323,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } } -#ifdef SUPPORT_ACLS - sx.acc_acl = sx.def_acl = NULL; -#endif -#ifdef SUPPORT_XATTRS - sx.xattr = NULL; -#endif if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) { parent_is_dry_missing: if (fuzzy_dirlist) { |