X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/030820d5dcb4799a8688187d9f5aa15525ae4be8..ff0c27c926564521ed58de838af76a4377838ae4:/acls.c

diff --git a/acls.c b/acls.c
index cc8d2e92..658c4996 100644
--- a/acls.c
+++ b/acls.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2006 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -741,7 +741,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)
@@ -770,7 +770,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);
 	}
 }
@@ -921,7 +921,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;