From: Wayne Davison <wayned@samba.org>
Date: Sun, 8 Jul 2007 20:53:35 +0000 (+0000)
Subject: Use the latest F_DIR_*() defines (whose names were tweaked).
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/e434f0ebfe4134325f95b484a905aa398c145f7c

Use the latest F_DIR_*() defines (whose names were tweaked).
---

diff --git a/acls.c b/acls.c
index 00787f09..6074d9ba 100644
--- a/acls.c
+++ b/acls.c
@@ -740,7 +740,7 @@ void receive_acl(struct file_struct *file, int f)
 	F_ACL(file) = recv_rsync_acl(&access_acl_list, SMB_ACL_TYPE_ACCESS, f);
 
 	if (S_ISDIR(file->mode))
-		F_DEF_ACL(file) = recv_rsync_acl(&default_acl_list, SMB_ACL_TYPE_DEFAULT, f);
+		F_DIR_DEFACL(file) = recv_rsync_acl(&default_acl_list, SMB_ACL_TYPE_DEFAULT, f);
 }
 
 static int cache_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type, item_list *racl_list)
@@ -769,7 +769,7 @@ void cache_acl(struct file_struct *file, statx *sxp)
 				      SMB_ACL_TYPE_ACCESS, &access_acl_list);
 
 	if (S_ISDIR(sxp->st.st_mode)) {
-		F_DEF_ACL(file) = cache_rsync_acl(sxp->def_acl,
+		F_DIR_DEFACL(file) = cache_rsync_acl(sxp->def_acl,
 				      SMB_ACL_TYPE_DEFAULT, &default_acl_list);
 	}
 }
@@ -920,7 +920,7 @@ int set_acl(const char *fname, const struct file_struct *file, statx *sxp)
 	if (!S_ISDIR(sxp->st.st_mode))
 		return unchanged;
 
-	ndx = F_DEF_ACL(file);
+	ndx = F_DIR_DEFACL(file);
 	if (ndx >= 0 && (size_t)ndx < default_acl_list.count) {
 		acl_duo *duo_item = default_acl_list.items;
 		duo_item += ndx;