-Depends-On-Patch: acls.diff
-
-After applying the above patch and this one, run these commands for a
-successful build:
+To use this patch, run these commands for a successful build:
+ patch -p1 <patches/acls.diff
+ patch -p1 <patches/adaptec_acl_mods.diff
./prepare-source
./configure --enable-acl-support
make
--- old/acls.c
+++ new/acls.c
-@@ -325,6 +325,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra
+@@ -282,6 +282,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra
}
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) {
-@@ -419,6 +422,12 @@ static int store_access_in_entry(uchar a
+@@ -376,6 +379,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)
-@@ -452,7 +461,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -409,7 +418,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) );
-@@ -463,7 +472,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -420,7 +429,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) );
-@@ -473,7 +482,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -430,7 +439,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
}
#ifdef ACLS_NEED_MASK
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) );
-@@ -487,7 +496,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -444,7 +453,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) );
#ifdef DEBUG
if (sys_acl_valid(*smb_acl) < 0)
-@@ -721,7 +730,7 @@ static void receive_rsync_acl(rsync_acl
+@@ -649,7 +658,7 @@ static void receive_rsync_acl(rsync_acl
while (count--) {
char tag = read_byte(f);
uchar access = read_byte(f);
rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
access);
exit_cleanup(RERR_STREAMIO);
-@@ -797,7 +806,7 @@ static void receive_rsync_acl(rsync_acl
+@@ -725,7 +734,7 @@ static void receive_rsync_acl(rsync_acl
racl->mask = NO_ENTRY;
}
} else if (racl->mask == NO_ENTRY) /* Must be non-empty with lists. */