X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/99650e0dc5f77324a2854adffea07814f054f669..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/acls.diff

diff --git a/acls.diff b/acls.diff
index eb4cc59..cafbf86 100644
--- a/acls.diff
+++ b/acls.diff
@@ -9,10 +9,20 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
---- old/acls.c
-+++ new/acls.c
-@@ -98,6 +98,18 @@ static const char *str_acl_type(SMB_ACL_
- 	     : "unknown SMB_ACL_TYPE_T";
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
+diff --git a/acls.c b/acls.c
+--- a/acls.c
++++ b/acls.c
+@@ -31,6 +31,7 @@ extern int list_only;
+ extern int orig_umask;
+ extern int numeric_ids;
+ extern int inc_recurse;
++extern int protocol_version;
+ 
+ /* Flags used to indicate what items are being transmitted for an entry. */
+ #define XMIT_USER_OBJ (1<<0)
+@@ -110,6 +111,18 @@ static const char *str_acl_type(SMB_ACL_TYPE_T type)
+ 	return "unknown ACL type!";
  }
  
 +#define OTHER_TYPE(t) (SMB_ACL_TYPE_ACCESS+SMB_ACL_TYPE_DEFAULT-(t))
@@ -30,7 +40,7 @@ To use this patch, run these commands for a successful build:
  static int calc_sacl_entries(const rsync_acl *racl)
  {
  	/* A System ACL always gets user/group/other permission entries. */
-@@ -522,6 +534,96 @@ int get_acl(const char *fname, statx *sx
+@@ -558,6 +571,96 @@ int get_acl(const char *fname, stat_x *sxp)
  	return 0;
  }
  
@@ -82,9 +92,9 @@ To use this patch, run these commands for a successful build:
 +	}
 +}
 +
-+/* Send the ACL from the statx structure down the indicated file descriptor.
++/* Send the ACL from the stat_x structure down the indicated file descriptor.
 + * This also frees the ACL data. */
-+void old_send_acl(statx *sxp, int f)
++void old_send_acl(stat_x *sxp, int f)
 +{
 +	SMB_ACL_TYPE_T type;
 +	rsync_acl *racl, *new_racl;
@@ -126,10 +136,10 @@ To use this patch, run these commands for a successful build:
 +
  /* === Send functions === */
  
- /* The general strategy with the tag_type <-> character mapping is that
-@@ -604,6 +706,11 @@ static void send_rsync_acl(rsync_acl *ra
+ /* Send the ida list over the file descriptor. */
+@@ -633,6 +736,11 @@ static void send_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type,
   * This also frees the ACL data. */
- void send_acl(statx *sxp, int f)
+ void send_acl(stat_x *sxp, int f)
  {
 +	if (protocol_version < 30) {
 +		old_send_acl(sxp, f);
@@ -139,7 +149,7 @@ To use this patch, run these commands for a successful build:
  	if (!sxp->acc_acl) {
  		sxp->acc_acl = create_racl();
  		rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
-@@ -621,6 +728,160 @@ void send_acl(statx *sxp, int f)
+@@ -650,6 +758,160 @@ void send_acl(stat_x *sxp, int f)
  	}
  }
  
@@ -292,7 +302,7 @@ To use this patch, run these commands for a successful build:
 +		if (type == SMB_ACL_TYPE_ACCESS)
 +			F_ACL(file) = ndx;
 +		else
-+			F_DEF_ACL(file) = ndx;
++			F_DIR_DEFACL(file) = ndx;
 +		racl_list = &default_acl_list;
 +	} while (BUMP_TYPE(type) && S_ISDIR(file->mode));
 +}
@@ -300,7 +310,7 @@ To use this patch, run these commands for a successful build:
  /* === Receive functions === */
  
  static uint32 recv_acl_access(uchar *name_follows_ptr, int f)
-@@ -738,6 +999,11 @@ static int recv_rsync_acl(item_list *rac
+@@ -765,6 +1027,11 @@ static int recv_rsync_acl(item_list *racl_list, SMB_ACL_TYPE_T type, int f)
  /* Receive the ACL info the sender has included for this file-list entry. */
  void receive_acl(struct file_struct *file, int f)
  {
@@ -312,12 +322,13 @@ To use this patch, run these commands for a successful build:
  	F_ACL(file) = recv_rsync_acl(&access_acl_list, SMB_ACL_TYPE_ACCESS, f);
  
  	if (S_ISDIR(file->mode))
---- old/compat.c
-+++ new/compat.c
-@@ -145,13 +145,6 @@ void setup_protocol(int f_out,int f_in)
- 	}
- 
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
+@@ -189,13 +189,6 @@ void setup_protocol(int f_out,int f_in)
  	if (protocol_version < 30) {
+ 		if (append_mode == 1)
+ 			append_mode = 2;
 -		if (preserve_acls && !local_server) {
 -			rprintf(FERROR,
 -			    "--acls requires protocol 30 or higher"