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
Applying uid/gid fix from trunk.
[rsync/rsync-patches.git]
/
acls.diff
diff --git
a/acls.diff
b/acls.diff
index
a18be5a
..
3cc4cb4
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-20,8
+20,8
@@
diff --git a/acls.c b/acls.c
/* 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)
-@@ -
97,6 +9
8,18 @@ static const char *str_acl_type(SMB_ACL_TYPE_T type)
-
: "unknown SMB_ACL_TYPE_T
";
+@@ -
107,6 +10
8,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))
}
+#define OTHER_TYPE(t) (SMB_ACL_TYPE_ACCESS+SMB_ACL_TYPE_DEFAULT-(t))
@@
-39,7
+39,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. */
static int calc_sacl_entries(const rsync_acl *racl)
{
/* A System ACL always gets user/group/other permission entries. */
-@@ -5
44,6 +55
7,96 @@ int get_acl(const char *fname, stat_x *sxp)
+@@ -5
54,6 +56
7,96 @@ int get_acl(const char *fname, stat_x *sxp)
return 0;
}
return 0;
}
@@
-136,7
+136,7
@@
diff --git a/acls.c b/acls.c
/* === Send functions === */
/* Send the ida list over the file descriptor. */
/* === Send functions === */
/* Send the ida list over the file descriptor. */
-@@ -6
19,6 +72
2,11 @@ static void send_rsync_acl(rsync_acl *racl, SMB_ACL_TYPE_T type,
+@@ -6
29,6 +73
2,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)
{
@@
-148,7
+148,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);
if (!sxp->acc_acl) {
sxp->acc_acl = create_racl();
rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
-@@ -6
36,6 +74
4,160 @@ void send_acl(stat_x *sxp, int f)
+@@ -6
46,6 +75
4,160 @@ void send_acl(stat_x *sxp, int f)
}
}
}
}
@@
-309,7
+309,7
@@
diff --git a/acls.c b/acls.c
/* === 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)
-@@ -7
58,6 +102
0,11 @@ static int recv_rsync_acl(item_list *racl_list, SMB_ACL_TYPE_T type, int f)
+@@ -7
68,6 +103
0,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)
{
@@
-324,7
+324,7
@@
diff --git a/acls.c b/acls.c
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -1
77,13 +177
,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -1
90,13 +190
,6 @@ void setup_protocol(int f_out,int f_in)
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;