X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/00188d68fd6237a24a4f71c26a3251b1951fa542..92796ae335c30ae51fc3aebd079a9f0246dae79d:/adaptec_acl_mods.diff

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index f9988e7..f0325a3 100644
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -1,8 +1,7 @@
-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
@@ -24,52 +23,14 @@ 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
-@@ -30,9 +30,11 @@ extern int am_root;
- extern int dry_run;
- extern int orig_umask;
- 
-+typedef unsigned short abits;
-+
- typedef struct {
- 	id_t id;
--	uchar access;
-+	abits access;
- } id_access;
- 
- typedef struct {
-@@ -41,15 +43,15 @@ typedef struct {
- 	id_access *idas;
- } ida_list;
- 
--#define NO_ENTRY ((uchar)0x80)
-+#define NO_ENTRY ((abits)0x8000)
- typedef struct {
- 	ida_list users;
- 	ida_list groups;
- 	/* These will be NO_ENTRY if there's no such entry. */
--	uchar user_obj;
--	uchar group_obj;
--	uchar mask;
--	uchar other;
-+	abits user_obj;
-+	abits group_obj;
-+	abits mask;
-+	abits other;
- } rsync_acl;
- 
- static const rsync_acl rsync_acl_initializer =
-@@ -148,7 +150,7 @@ static BOOL unpack_smb_acl(rsync_acl *ra
- 	     rc = sys_acl_get_entry(sacl, SMB_ACL_NEXT_ENTRY, &entry)) {
- 		SMB_ACL_TAG_T tag_type;
- 		SMB_ACL_PERMSET_T permset;
--		uchar access;
-+		abits access;
- 		void *qualifier;
- 		id_access *ida;
- 		ida_list *idal;
-@@ -162,6 +164,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra
+@@ -306,6 +306,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)
@@ -77,17 +38,9 @@ with literal values were needed.
 +		       | (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 given idal */
+ 		/* continue == done with entry; break == store in temporary ida list */
  		switch (tag_type) {
-@@ -559,13 +564,19 @@ static void expand_smb_acl_list(smb_acl_
- #define COE(func,args) CALL_OR_ERROR(func,args,#func)
- #define COE2(func,args) CALL_OR_ERROR(func,args,NULL)
- 
--static int store_access_in_entry(uchar access, SMB_ACL_ENTRY_T entry)
-+static int store_access_in_entry(abits access, SMB_ACL_ENTRY_T entry)
- {
- 	const char *errfun = NULL;
- 	SMB_ACL_PERMSET_T permset;
+@@ -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) );
@@ -100,38 +53,72 @@ with literal values were needed.
  	if (access & 4)
  		COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
  	if (access & 2)
-@@ -645,7 +656,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
- 	return False;
- }
+@@ -433,7 +442,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
  
--static mode_t change_sacl_perms(SMB_ACL_T sacl, uchar mask, mode_t old_mode, mode_t mode)
-+static mode_t change_sacl_perms(SMB_ACL_T sacl, abits mask, mode_t old_mode, mode_t mode)
- {
- 	SMB_ACL_ENTRY_T entry;
- 	int group_id = mask != NO_ENTRY ? SMB_ACL_MASK : SMB_ACL_GROUP_OBJ;
-@@ -696,7 +707,7 @@ static mode_t change_sacl_perms(SMB_ACL_
+ 	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) );
  
- static void receive_rsync_acl(rsync_acl *racl, int f)
- {
--	uchar computed_mask_bits = 0;
-+	abits computed_mask_bits = 0;
- 	ida_list *idal = NULL;
- 	id_access *ida;
- 	size_t count;
-@@ -708,8 +719,8 @@ static void receive_rsync_acl(rsync_acl 
+ 	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);
+ 		uchar access = read_byte(f);
 -		if (access & ~ (4 | 2 | 1)) {
-+		abits access = read_byte(f);
 +		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);
---- old/smb_acls.h
-+++ new/smb_acls.h
-@@ -33,6 +33,11 @@
+@@ -831,7 +840,7 @@ static void old_recv_rsync_acl(rsync_acl
+ 			racl->mask_obj = NO_ENTRY;
+ 		}
+ 	} 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