Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fdf967c
)
Fixed some compilation errors that crept into the code.
author
Wayne Davison
<wayned@samba.org>
Sun, 17 Dec 2006 01:32:37 +0000
(
01:32
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 17 Dec 2006 01:32:37 +0000
(
01:32
+0000)
acls.diff
patch
|
blob
|
blame
|
history
diff --git
a/acls.diff
b/acls.diff
index
5bd3571
..
67d5ca4
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-31,7
+31,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -0,0 +1,109
6
@@
+@@ -0,0 +1,109
3
@@
+/*
+ * Handle passing Access Control Lists between systems.
+ *
+/*
+ * Handle passing Access Control Lists between systems.
+ *
@@
-63,9
+63,6
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+extern int read_only;
+extern int list_only;
+extern int orig_umask;
+extern int read_only;
+extern int list_only;
+extern int orig_umask;
-+extern int preserve_acls;
-+extern int flist_extra_ndx;
-+extern unsigned int file_struct_len;
+
+/* === ACL structures === */
+
+
+/* === ACL structures === */
+
@@
-1351,7
+1348,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#ifdef SUPPORT_ACLS
+ /* We need one or two index int32s when we're preserving ACLs. */
+ if (preserve_acls)
+#ifdef SUPPORT_ACLS
+ /* We need one or two index int32s when we're preserving ACLs. */
+ if (preserve_acls)
-+ extra_len += (S_ISDIR(mode) ? 2 : 1) *
sizeof (union flist_extras)
;
++ extra_len += (S_ISDIR(mode) ? 2 : 1) *
EXTRA_LEN
;
+#endif
+
if (always_checksum && S_ISREG(mode))
+#endif
+
if (always_checksum && S_ISREG(mode))
@@
-5973,7
+5970,15
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#define GID_NONE ((gid_t)-1)
union file_extras {
#define GID_NONE ((gid_t)-1)
union file_extras {
-@@ -554,10 +562,12 @@ extern int preserve_gid;
+@@ -522,6 +530,7 @@ struct file_struct {
+ extern int flist_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_acls;
+
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -554,10 +563,12 @@ extern int preserve_gid;
/* When the associated option is on, all entries will have these present: */
#define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
#define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
/* When the associated option is on, all entries will have these present: */
#define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
#define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
@@
-5986,7
+5991,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
/* This optional item might follow an F_HL_*() item.
* (Note: a device doesn't need to check LEN64_BUMP(f).) */
/* This optional item might follow an F_HL_*() item.
* (Note: a device doesn't need to check LEN64_BUMP(f).) */
-@@ -693,6 +70
3
,17 @@ struct stats {
+@@ -693,6 +70
4
,17 @@ struct stats {
struct chmod_mode_struct;
struct chmod_mode_struct;
@@
-6004,7
+6009,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
#include "byteorder.h"
#include "lib/mdfour.h"
#include "lib/wildmatch.h"
-@@ -711,6 +73
2
,16 @@ struct chmod_mode_struct;
+@@ -711,6 +73
3
,16 @@ struct chmod_mode_struct;
#define NORETURN __attribute__((__noreturn__))
#endif
#define NORETURN __attribute__((__noreturn__))
#endif