From: Wayne Davison <wayned@samba.org>
Date: Sat, 5 Jun 2010 06:10:47 +0000 (-0700)
Subject: Fix daemon-filter crash issue (bug 7489).
X-Git-Tag: v3.0.8pre1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9;p=thirdparty%2Frsync.git

Fix daemon-filter crash issue (bug 7489).
---

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) {