./configure (optional if already run)
make
---- old/acls.c
-+++ new/acls.c
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+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;
/* 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))
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
+@@ -555,6 +568,96 @@ int get_acl(const char *fname, stat_x *sxp)
return 0;
}
/* === Send functions === */
/* Send the ida list over the file descriptor. */
-@@ -620,6 +723,11 @@ static void send_rsync_acl(rsync_acl *ra
+@@ -630,6 +733,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(stat_x *sxp, int f)
+ void send_acl(int f, stat_x *sxp)
{
+ if (protocol_version < 30) {
+ old_send_acl(sxp, f);
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)
+@@ -647,6 +755,160 @@ void send_acl(int f, stat_x *sxp)
}
}
+
/* === 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
+ 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
/* Receive the ACL info the sender has included for this file-list entry. */
- void receive_acl(struct file_struct *file, int f)
+ void receive_acl(int f, struct file_struct *file)
{
+ if (protocol_version < 30) {
+ old_recv_acl(file, f);
+ return;
+ }
+
- F_ACL(file) = recv_rsync_acl(&access_acl_list, SMB_ACL_TYPE_ACCESS, f);
+ F_ACL(file) = recv_rsync_acl(f, &access_acl_list, SMB_ACL_TYPE_ACCESS, file->mode);
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;