Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding filter-attribute-mods patch; updating patches.
[rsync/rsync-patches.git]
/
acls.diff
diff --git
a/acls.diff
b/acls.diff
index
6c5ffa7
..
cafbf86
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-9,8
+9,8
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
diff --git a/acls.c b/acls.c
diff --git a/acls.c b/acls.c
-index 6e0f601..3a613c5 100644
--- a/acls.c
+++ b/acls.c
@@ -31,6 +31,7 @@ extern int list_only;
--- a/acls.c
+++ b/acls.c
@@ -31,6 +31,7 @@ extern int list_only;
@@
-21,7
+21,7
@@
index 6e0f601..3a613c5 100644
/* Flags used to indicate what items are being transmitted for an entry. */
#define XMIT_USER_OBJ (1<<0)
/* Flags used to indicate what items are being transmitted for an entry. */
#define XMIT_USER_OBJ (1<<0)
-@@ -1
07,6 +108
,18 @@ static const char *str_acl_type(SMB_ACL_TYPE_T type)
+@@ -1
10,6 +111
,18 @@ static const char *str_acl_type(SMB_ACL_TYPE_T type)
return "unknown ACL type!";
}
return "unknown ACL type!";
}
@@
-40,7
+40,7
@@
index 6e0f601..3a613c5 100644
static int calc_sacl_entries(const rsync_acl *racl)
{
/* A System ACL always gets user/group/other permission entries. */
static int calc_sacl_entries(const rsync_acl *racl)
{
/* A System ACL always gets user/group/other permission entries. */
-@@ -55
4,6 +567
,96 @@ int get_acl(const char *fname, stat_x *sxp)
+@@ -55
8,6 +571
,96 @@ int get_acl(const char *fname, stat_x *sxp)
return 0;
}
return 0;
}
@@
-137,7
+137,7
@@
index 6e0f601..3a613c5 100644
/* === Send functions === */
/* Send the ida list over the file descriptor. */
/* === Send functions === */
/* Send the ida list over the file descriptor. */
-@@ -6
29,6 +732
,11 @@ static void send_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type,
+@@ -6
33,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)
{
* This also frees the ACL data. */
void send_acl(stat_x *sxp, int f)
{
@@
-149,7
+149,7
@@
index 6e0f601..3a613c5 100644
if (!sxp->acc_acl) {
sxp->acc_acl = create_racl();
rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
if (!sxp->acc_acl) {
sxp->acc_acl = create_racl();
rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
-@@ -6
46,6 +754
,160 @@ void send_acl(stat_x *sxp, int f)
+@@ -6
50,6 +758
,160 @@ void send_acl(stat_x *sxp, int f)
}
}
}
}
@@
-310,7
+310,7
@@
index 6e0f601..3a613c5 100644
/* === Receive functions === */
static uint32 recv_acl_access(uchar *name_follows_ptr, int f)
/* === Receive functions === */
static uint32 recv_acl_access(uchar *name_follows_ptr, int f)
-@@ -76
8,6 +1030
,11 @@ static int recv_rsync_acl(item_list *racl_list, SMB_ACL_TYPE_T type, int f)
+@@ -76
5,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)
{
/* Receive the ACL info the sender has included for this file-list entry. */
void receive_acl(struct file_struct *file, int f)
{
@@
-323,7
+323,6
@@
index 6e0f601..3a613c5 100644
if (S_ISDIR(file->mode))
diff --git a/compat.c b/compat.c
if (S_ISDIR(file->mode))
diff --git a/compat.c b/compat.c
-index 6e00072..1b66069 100644
--- a/compat.c
+++ b/compat.c
@@ -189,13 +189,6 @@ void setup_protocol(int f_out,int f_in)
--- a/compat.c
+++ b/compat.c
@@ -189,13 +189,6 @@ void setup_protocol(int f_out,int f_in)