Fixed build problem.

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

diff --git a/acls.diff b/acls.diff
index b7a8a36..41ecca2 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -11,7 +11,15 @@ To use this patch, run these commands for a successful build:
 
 --- old/acls.c
 +++ new/acls.c
-@@ -97,6 +97,18 @@ static const char *str_acl_type(SMB_ACL_
+@@ -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)
+@@ -97,6 +98,18 @@ static const char *str_acl_type(SMB_ACL_
             : "unknown SMB_ACL_TYPE_T";
  }
  
@@ -30,7 +38,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 +557,96 @@ int get_acl(const char *fname, stat_x *s
+@@ -545,6 +558,96 @@ int get_acl(const char *fname, stat_x *s
        return 0;
  }
  
@@ -82,9 +90,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;
@@ -127,7 +135,7 @@ To use this patch, run these commands for a successful build:
  /* === Send functions === */
  
  /* Send the ida list over the file descriptor. */
-@@ -620,6 +722,11 @@ static void send_rsync_acl(rsync_acl *ra
+@@ -620,6 +723,11 @@ static void send_rsync_acl(rsync_acl *ra
   * This also frees the ACL data. */
  void send_acl(stat_x *sxp, int f)
  {
@@ -139,7 +147,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 +744,160 @@ void send_acl(stat_x *sxp, int f)
+@@ -637,6 +745,160 @@ void send_acl(stat_x *sxp, int f)
        }
  }
  
@@ -300,7 +308,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 +1020,11 @@ static int recv_rsync_acl(item_list *rac
+@@ -759,6 +1021,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)
  {