X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/af7ee4d84eac7f7e876556e63a31d89ced9a607d..c4bd76ea96ca69010c8f4620381acc3d5b8f7cd8:/adaptec_acl_mods.diff diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff index a9dec03..f0325a3 100644 --- a/adaptec_acl_mods.diff +++ b/adaptec_acl_mods.diff @@ -1,4 +1,10 @@ -Depends-On-Patch: acls.diff +To use this patch, run these commands for a successful build: + + patch -p1 Attached is a small patch which is meant to be applied to a copy of @@ -17,52 +23,102 @@ Philip Lowman wrote: I (Wayne) tweaked the patch for style and to avoid using SMB_* constants with literal values were needed. +I've also updated it to apply to the updated version of the acls.diff, +though I don't know if there might be some bits lost in the current +algorithm when using the file's mode bits to reconstruct a stripped ACL +entry. + --- old/acls.c +++ new/acls.c -@@ -146,6 +146,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra +@@ -306,6 +306,9 @@ static BOOL unpack_smb_acl(SMB_ACL_T sac } - race->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_DELETE) ? 8 : 0) -+ | (sys_acl_get_perm(permset, SMB_ACL_CHMOD) ? 16 : 0) -+ | (sys_acl_get_perm(permset, SMB_ACL_CHOWN) ? 32 : 0) - | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0); - switch (race->tag_type) { - case SMB_ACL_USER: -@@ -575,6 +578,21 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_ - errfun = "sys_acl_add_perm"; - break; - } -+ if (race->access & 8) -+ if (sys_acl_add_perm(permset, SMB_ACL_DELETE)) { -+ errfun = "sys_acl_add_perm"; -+ break; -+ } -+ if (race->access & 16) -+ if (sys_acl_add_perm(permset, SMB_ACL_CHMOD)) { -+ errfun = "sys_acl_add_perm"; -+ break; -+ } -+ if (race->access & 32) -+ if (sys_acl_add_perm(permset, SMB_ACL_CHOWN)) { -+ errfun = "sys_acl_add_perm"; -+ break; -+ } - if (sys_acl_set_permset(entry, permset)) { - errfun = "sys_acl_set_permset"; - break; -@@ -634,7 +652,7 @@ static void receive_rsync_acl(rsync_acl + 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_DELETE) ? 8 : 0) ++ | (sys_acl_get_perm(permset, SMB_ACL_CHMOD) ? 16 : 0) ++ | (sys_acl_get_perm(permset, SMB_ACL_CHOWN) ? 32 : 0) + | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0); + /* continue == done with entry; break == store in temporary ida list */ + switch (tag_type) { +@@ -400,6 +403,12 @@ static int store_access_in_entry(uchar a + + COE( sys_acl_get_permset,(entry, &permset) ); + COE( sys_acl_clear_perms,(permset) ); ++ if (access & 32) ++ COE( sys_acl_add_perm(permset, SMB_ACL_CHOWN) ); ++ if (access & 16) ++ COE( sys_acl_add_perm(permset, SMB_ACL_CHMOD) ); ++ if (access & 8) ++ COE( sys_acl_add_perm(permset, SMB_ACL_DELETE) ); + if (access & 4) + COE( sys_acl_add_perm,(permset, SMB_ACL_READ) ); + if (access & 2) +@@ -433,7 +442,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) ); +- COE2( store_access_in_entry,(racl->user_obj & 7, entry) ); ++ COE2( store_access_in_entry,(racl->user_obj & 077, entry) ); + + for (ida = racl->users.idas, count = racl->users.count; count--; ida++) { + COE( sys_acl_create_entry,(smb_acl, &entry) ); +@@ -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_GROUP_OBJ) ); +- COE2( store_access_in_entry,(racl->group_obj & 7, entry) ); ++ COE2( store_access_in_entry,(racl->group_obj & 077, entry) ); + + for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) { + COE( sys_acl_create_entry,(smb_acl, &entry) ); +@@ -454,7 +463,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_ + } + + #ifdef ACLS_NEED_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) ); +@@ -468,7 +477,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_obj & 7, entry) ); ++ COE2( store_access_in_entry,(racl->other_obj & 077, entry) ); + + #ifdef DEBUG + if (sys_acl_valid(*smb_acl) < 0) +@@ -765,7 +774,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, "old_recv_rsync_acl: bogus permset %o\n", + access); exit_cleanup(RERR_STREAMIO); +@@ -831,7 +840,7 @@ static void old_recv_rsync_acl(rsync_acl + racl->mask_obj = NO_ENTRY; } - race->access = read_byte(f); -- if (race->access & ~ (4 | 2 | 1)) { -+ if (race->access & ~(32 | 16 | 8 | 4 | 2 | 1)) { - rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n", - race->access); - exit_cleanup(RERR_STREAMIO); ---- old/smb_acls.h -+++ new/smb_acls.h -@@ -33,6 +33,11 @@ + } 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. */ +@@ -903,7 +912,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/lib/sysacls.h ++++ new/lib/sysacls.h +@@ -45,6 +45,11 @@ #define SMB_ACL_READ ACL_READ #define SMB_ACL_WRITE ACL_WRITE #define SMB_ACL_EXECUTE ACL_EXECUTE