From: Wayne Davison <wayned@samba.org>
Date: Sun, 19 Jan 2014 20:24:01 +0000 (-0800)
Subject: Avoid ACL and/or xattr lookups on IS_MISSING_FILE() entries.
X-Git-Tag: v3.1.1pre1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bba31ddf122c18ec88fe26a30c5ab9844d41ace7;p=thirdparty%2Frsync.git

Avoid ACL and/or xattr lookups on IS_MISSING_FILE() entries.
Fixes bug 10381.
---

diff --git a/acls.c b/acls.c
index 23bdf86a..3f277b8e 100644
--- a/acls.c
+++ b/acls.c
@@ -560,7 +560,8 @@ int get_acl(const char *fname, stat_x *sxp)
 		if (!preserve_devices)
 #endif
 			return 0;
-	}
+	} else if (IS_MISSING_FILE(sxp->st))
+		return 0;
 
 	if (get_rsync_acl(fname, sxp->acc_acl, SMB_ACL_TYPE_ACCESS,
 			  sxp->st.st_mode) < 0) {
diff --git a/xattrs.c b/xattrs.c
index 01d30e4b..7e31422c 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -308,7 +308,8 @@ int get_xattr(const char *fname, stat_x *sxp)
 		if (!preserve_devices)
 #endif
 			return 0;
-	}
+	} else if (IS_MISSING_FILE(sxp->st))
+		return 0;
 
 	if (rsync_xal_get(fname, sxp->xattr) < 0) {
 		free_xattr(sxp);