X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=blobdiff_plain;f=acls.diff;h=85f4c9029e8d67092827cab57ccdb927bda40973;hp=87ad3d051d15f3a1f06a5168f5b71019f66a6474;hb=c4e4664b23e4400807d6df0e4479ede4b205dd8b;hpb=5214a41bbae94607b196b199b483710e1babf292

diff --git a/acls.diff b/acls.diff
index 87ad3d0..85f4c90 100644
--- a/acls.diff
+++ b/acls.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: 3bd9f51917ed5718275c6132006be155239a0550
 diff --git a/acls.c b/acls.c
 --- a/acls.c
 +++ b/acls.c
@@ -18,10 +18,10 @@ diff --git a/acls.c b/acls.c
  extern int numeric_ids;
  extern int inc_recurse;
 +extern int protocol_version;
+ extern int preserve_devices;
+ extern int preserve_specials;
  
- /* 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)
+@@ -112,6 +113,18 @@ static const char *str_acl_type(SMB_ACL_TYPE_T type)
  	return "unknown ACL type!";
  }
  
@@ -40,7 +40,7 @@ diff --git a/acls.c b/acls.c
  static int calc_sacl_entries(const rsync_acl *racl)
  {
  	/* A System ACL always gets user/group/other permission entries. */
-@@ -555,6 +568,96 @@ int get_acl(const char *fname, stat_x *sxp)
+@@ -574,6 +587,96 @@ int get_acl(const char *fname, stat_x *sxp)
  	return 0;
  }
  
@@ -137,7 +137,7 @@ diff --git a/acls.c b/acls.c
  /* === Send functions === */
  
  /* Send the ida list over the file descriptor. */
-@@ -630,6 +733,11 @@ static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,
+@@ -649,6 +752,11 @@ static void send_rsync_acl(int f, rsync_acl *racl, SMB_ACL_TYPE_T type,
   * This also frees the ACL data. */
  void send_acl(int f, stat_x *sxp)
  {
@@ -149,7 +149,7 @@ diff --git a/acls.c b/acls.c
  	if (!sxp->acc_acl) {
  		sxp->acc_acl = create_racl();
  		rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
-@@ -647,6 +755,160 @@ void send_acl(int f, stat_x *sxp)
+@@ -666,6 +774,160 @@ void send_acl(int f, stat_x *sxp)
  	}
  }
  
@@ -310,7 +310,7 @@ diff --git a/acls.c b/acls.c
  /* === Receive functions === */
  
  static uint32 recv_acl_access(int f, uchar *name_follows_ptr)
-@@ -768,6 +1030,11 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
+@@ -787,6 +1049,11 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
  /* Receive the ACL info the sender has included for this file-list entry. */
  void receive_acl(int f, struct file_struct *file)
  {
@@ -325,7 +325,7 @@ diff --git a/acls.c b/acls.c
 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)
+@@ -192,13 +192,6 @@ void setup_protocol(int f_out,int f_in)
  	if (protocol_version < 30) {
  		if (append_mode == 1)
  			append_mode = 2;