--- old/acls.c
+++ new/acls.c
-@@ -282,6 +282,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra
+@@ -307,6 +307,9 @@ static BOOL unpack_smb_acl(SMB_ACL_T sac
}
access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
| (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
| (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
/* continue == done with entry; break == store in temporary ida list */
switch (tag_type) {
-@@ -376,6 +379,12 @@ static int store_access_in_entry(uchar a
+@@ -401,6 +404,12 @@ static int store_access_in_entry(uchar a
COE( sys_acl_get_permset,(entry, &permset) );
COE( sys_acl_clear_perms,(permset) );
if (access & 4)
COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
if (access & 2)
-@@ -409,7 +418,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -434,7 +443,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER_OBJ) );
for (ida = racl->users.idas, count = racl->users.count; count--; ida++) {
COE( sys_acl_create_entry,(smb_acl, &entry) );
-@@ -420,7 +429,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -445,7 +454,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP_OBJ) );
for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) {
COE( sys_acl_create_entry,(smb_acl, &entry) );
-@@ -430,7 +439,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -455,7 +464,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
}
#ifdef ACLS_NEED_MASK
-- mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 7 : racl->mask;
-+ mask_bits = racl->mask == NO_ENTRY ? racl->group_obj & 077 : racl->mask;
+- mask_bits = racl->mask_obj == NO_ENTRY ? racl->group_obj & 7 : racl->mask_obj;
++ mask_bits = racl->mask_obj == NO_ENTRY ? racl->group_obj & 077 : racl->mask_obj;
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
COE2( store_access_in_entry,(mask_bits, entry) );
-@@ -444,7 +453,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -469,7 +478,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
COE( sys_acl_create_entry,(smb_acl, &entry) );
COE( sys_acl_set_tag_type,(entry, SMB_ACL_OTHER) );
-- COE2( store_access_in_entry,(racl->other & 7, entry) );
-+ COE2( store_access_in_entry,(racl->other & 077, entry) );
+- COE2( store_access_in_entry,(racl->other_obj & 7, entry) );
++ COE2( store_access_in_entry,(racl->other_obj & 077, entry) );
#ifdef DEBUG
if (sys_acl_valid(*smb_acl) < 0)
-@@ -649,7 +658,7 @@ static void receive_rsync_acl(rsync_acl
+@@ -766,7 +775,7 @@ static void old_recv_rsync_acl(rsync_acl
while (count--) {
char tag = read_byte(f);
uchar access = read_byte(f);
- if (access & ~ (4 | 2 | 1)) {
+ if (access & ~(32 | 16 | 8 | 4 | 2 | 1)) {
- rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
+ rprintf(FERROR, "old_recv_rsync_acl: bogus permset %o\n",
access);
exit_cleanup(RERR_STREAMIO);
-@@ -725,7 +734,7 @@ static void receive_rsync_acl(rsync_acl
- racl->mask = NO_ENTRY;
+@@ -832,7 +841,7 @@ static void old_recv_rsync_acl(rsync_acl
+ racl->mask_obj = NO_ENTRY;
}
- } else if (racl->mask == NO_ENTRY) /* Must be non-empty with lists. */
-- racl->mask = computed_mask_bits | (racl->group_obj & 7);
-+ racl->mask = computed_mask_bits | (racl->group_obj & 077);
+ } else if (racl->mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
+- racl->mask_obj = computed_mask_bits | (racl->group_obj & 7);
++ racl->mask_obj = computed_mask_bits | (racl->group_obj & 077);
}
/* Receive the ACL info the sender has included for this file-list entry. */
+@@ -904,7 +913,7 @@ static uchar recv_acl_access(uchar *name
+ *name_follows_val = 0;
+ }
+
+- if (access & ~(4 | 2 | 1)) {
++ if (access & ~(32 | 16 | 8 | 4 | 2 | 1)) {
+ rprintf(FERROR, "recv_acl_access: bogus permset %o\n", access);
+ exit_cleanup(RERR_STREAMIO);
+ }
--- old/smb_acls.h
+++ new/smb_acls.h
@@ -33,6 +33,11 @@