We now compile when UF_NOUNLINK and/or SF_NOUNLINK are undefined.

[rsync/rsync-patches.git] / acls.diff

diff --git a/acls.diff b/acls.diff
index 45359df..1c10a72 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -122,7 +122,7 @@ To use this patch, run these commands for a successful build:
  /* === Send functions === */
  
  /* The general strategy with the tag_type <-> character mapping is that
-@@ -631,6 +728,10 @@ static void send_rsync_acl(rsync_acl *ra
+@@ -631,6 +728,11 @@ static void send_rsync_acl(rsync_acl *ra
   * This also frees the ACL data. */
  void send_acl(statx *sxp, int f)
  {
@@ -130,10 +130,11 @@ To use this patch, run these commands for a successful build:
 +              old_send_acl(sxp, f);
 +              return;
 +      }
- 
++
        if (!sxp->acc_acl) {
                sxp->acc_acl = create_racl();
-@@ -649,6 +750,146 @@ void send_acl(statx *sxp, int f)
+               rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
+@@ -648,6 +750,146 @@ void send_acl(statx *sxp, int f)
        }
  }
  
@@ -280,7 +281,7 @@ To use this patch, run these commands for a successful build:
  /* === Receive functions === */
  
  static uchar recv_acl_access(uchar *name_follows_val, int f)
-@@ -768,6 +1009,11 @@ static int recv_rsync_acl(item_list *rac
+@@ -767,6 +1009,11 @@ static int recv_rsync_acl(item_list *rac
  /* Receive the ACL info the sender has included for this file-list entry. */
  void receive_acl(struct file_struct *file, int f)
  {