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

diff --git a/acls.diff b/acls.diff
index 41ecca2..cafbf86 100644
--- a/acls.diff
+++ b/acls.diff
@@ -9,8 +9,10 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
---- old/acls.c
-+++ new/acls.c
+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;
@@ -19,8 +21,8 @@ To use this patch, run these commands for a successful build:
  
  /* Flags used to indicate what items are being transmitted for an entry. */
  #define XMIT_USER_OBJ (1<<0)
-@@ -97,6 +98,18 @@ static const char *str_acl_type(SMB_ACL_
- 	     : "unknown SMB_ACL_TYPE_T";
+@@ -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))
@@ -38,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. */
-@@ -545,6 +558,96 @@ int get_acl(const char *fname, stat_x *s
+@@ -558,6 +571,96 @@ int get_acl(const char *fname, stat_x *sxp)
  	return 0;
  }
  
@@ -135,7 +137,7 @@ To use this patch, run these commands for a successful build:
  /* === Send functions === */
  
  /* Send the ida list over the file descriptor. */
-@@ -620,6 +723,11 @@ static void send_rsync_acl(rsync_acl *ra
+@@ -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(stat_x *sxp, int f)
  {
@@ -147,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);
-@@ -637,6 +745,160 @@ void send_acl(stat_x *sxp, int f)
+@@ -650,6 +758,160 @@ void send_acl(stat_x *sxp, int f)
  	}
  }
  
@@ -308,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)
-@@ -759,6 +1021,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)
  {
@@ -320,9 +322,10 @@ 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
-@@ -160,13 +160,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;