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
The patches for 3.0.0pre7.
[rsync/rsync-patches.git]
/
acls.diff
diff --git
a/acls.diff
b/acls.diff
index
41ecca2
..
d1f8cd3
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-9,8
+9,9
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
---- old/acls.c
-+++ new/acls.c
+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;
@@ -31,6 +31,7 @@ extern int list_only;
extern int orig_umask;
extern int numeric_ids;
@@
-19,7
+20,7
@@
To use this patch, run these commands for a successful build:
/* 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 +98,18 @@ static const char *str_acl_type(SMB_ACL_
+@@ -97,6 +98,18 @@ static const char *str_acl_type(SMB_ACL_
TYPE_T type)
: "unknown SMB_ACL_TYPE_T";
}
: "unknown SMB_ACL_TYPE_T";
}
@@
-38,7
+39,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. */
static int calc_sacl_entries(const rsync_acl *racl)
{
/* A System ACL always gets user/group/other permission entries. */
-@@ -54
5,6 +558,96 @@ int get_acl(const char *fname, stat_x *s
+@@ -54
4,6 +557,96 @@ int get_acl(const char *fname, stat_x *sxp)
return 0;
}
return 0;
}
@@
-135,7
+136,7
@@
To use this patch, run these commands for a successful build:
/* === Send functions === */
/* Send the ida list over the file descriptor. */
/* === Send functions === */
/* Send the ida list over the file descriptor. */
-@@ -6
20,6 +723,11 @@ static void send_rsync_acl(rsync_acl *ra
+@@ -6
19,6 +722,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)
{
@@
-147,7
+148,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);
if (!sxp->acc_acl) {
sxp->acc_acl = create_racl();
rsync_acl_fake_perms(sxp->acc_acl, sxp->st.st_mode);
-@@ -63
7,6 +745
,160 @@ void send_acl(stat_x *sxp, int f)
+@@ -63
6,6 +744
,160 @@ void send_acl(stat_x *sxp, int f)
}
}
}
}
@@
-308,7
+309,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)
/* === Receive functions === */
static uint32 recv_acl_access(uchar *name_follows_ptr, int f)
-@@ -75
9,6 +1021,11 @@ static int recv_rsync_acl(item_list *rac
+@@ -75
8,6 +1020,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)
{
@@
-320,9
+321,10
@@
To use this patch, run these commands for a successful build:
F_ACL(file) = recv_rsync_acl(&access_acl_list, SMB_ACL_TYPE_ACCESS, f);
if (S_ISDIR(file->mode))
F_ACL(file) = recv_rsync_acl(&access_acl_list, SMB_ACL_TYPE_ACCESS, f);
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
+@@ -175,13 +175,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;