X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/1fcc420a567b7fab48a1a0823b730e6d38cd2892..refs/heads/master:/adaptec_acl_mods.diff

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index 92b4c2b..eaa1ed2 100644
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -1,83 +1,86 @@
-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/adaptec_acl_mods.diff
     ./prepare-source
     ./configure --enable-acl-support
     make
 
 Philip Lowman wrote:
-> Attached is a small patch which is meant to be applied to a copy of
-> rsync which has already been patched with acl support (the acls.diff
-> file in the patches folder).  It allows the preservation of the delete,
+> Attached is a small patch which allows the preservation of the delete,
 > chmod, and chown bits which Adaptec has added to XFS on their SnapOS NAS
 > units.  This is nice for backing up files between different NAS units
 > and preserving all of the Samba ACLs.
-> 
+>
 > I'm not sure how useful this patch will be because I'm not sure if any
 > other NAS vendors have standardized on their extensions to POSIX ACLs to
 > support Samba in the same manner that Adaptec has.  FWIW, though, this
 > will allow you to preserve acls when copying between different Adaptec
 > based NAS units running SnapOS.
 
-I (Wayne) tweaked the patch for style and to avoid using SMB_* constants
-with literal values were needed.
+I (Wayne) tweaked the patch to work with the latest source.
+
+Todo:
 
---- old/acls.c
-+++ new/acls.c
-@@ -146,6 +146,9 @@ static BOOL unpack_smb_acl(rsync_acl *ra
- 		}
- 		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 
- 			exit_cleanup(RERR_STREAMIO);
- 		}
- 		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 @@
- #define SMB_ACL_READ		ACL_READ
- #define SMB_ACL_WRITE		ACL_WRITE
- #define SMB_ACL_EXECUTE		ACL_EXECUTE
+Fix a bug that could lose some bits when stripping some (supposedly)
+superfluous ACL info.
+
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
+diff --git a/lib/sysacls.c b/lib/sysacls.c
+--- a/lib/sysacls.c
++++ b/lib/sysacls.c
+@@ -31,6 +31,18 @@
+ #endif
+ #define DEBUG(x,y)
+ 
 +/* These are custom ACL bits used by Adaptec's modifications
 + * to XFS on their SnapOS units. */
-+#define SMB_ACL_DELETE		0x08
-+#define SMB_ACL_CHMOD		0x10
-+#define SMB_ACL_CHOWN		0x20
++#ifndef ACL_DELETE
++#define ACL_DELETE 8
++#endif
++#ifndef ACL_CHMOD
++#define ACL_CHMOD 16
++#endif
++#ifndef ACL_CHOWN
++#define ACL_CHOWN 32
++#endif
++
+ void SAFE_FREE(void *mem)
+ {
+ 	if (mem)
+@@ -100,6 +112,9 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b
+ 		return -1;
+ 
+ 	*bits_p = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
++		| (acl_get_perm(permset, ACL_CHOWN) ? 32 : 0)
++		| (acl_get_perm(permset, ACL_CHMOD) ? 16 : 0)
++		| (acl_get_perm(permset, ACL_DELETE) ? 8 : 0)
+ 		| (acl_get_perm(permset, ACL_WRITE) ? 2 : 0)
+ 		| (acl_get_perm(permset, ACL_EXECUTE) ? 1 : 0);
+ 
+@@ -144,6 +159,12 @@ int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
+ 	if ((rc = acl_get_permset(entry, &permset)) != 0)
+ 		return rc;
+ 	acl_clear_perms(permset);
++	if (bits & 32)
++		acl_add_perm(permset, ACL_CHOWN);
++	if (bits & 16)
++		acl_add_perm(permset, ACL_CHMOD);
++	if (bits & 8)
++		acl_add_perm(permset, ACL_DELETE);
+ 	if (bits & 4)
+ 		acl_add_perm(permset, ACL_READ);
+ 	if (bits & 2)
+diff --git a/lib/sysacls.h b/lib/sysacls.h
+--- a/lib/sysacls.h
++++ b/lib/sysacls.h
+@@ -59,8 +59,8 @@
+ #define SMB_ACL_TYPE_ACCESS	ACL_TYPE_ACCESS
+ #define SMB_ACL_TYPE_DEFAULT	ACL_TYPE_DEFAULT
+ 
+-#define SMB_ACL_VALID_NAME_BITS	(4 | 2 | 1)
+-#define SMB_ACL_VALID_OBJ_BITS	(4 | 2 | 1)
++#define SMB_ACL_VALID_NAME_BITS	(32 | 16 | 8 | 4 | 2 | 1)
++#define SMB_ACL_VALID_OBJ_BITS	(32 | 16 | 8 | 4 | 2 | 1)
+ 
+ #define SMB_ACL_NEED_SORT
  
- /* Types of ACLs. */
- #define SMB_ACL_USER		ACL_USER