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 (parent:
6e4c2d0
)
Added missing DEBUG() define.
author
Wayne Davison
<wayned@samba.org>
Sun, 22 Oct 2006 07:15:17 +0000
(07:15 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 22 Oct 2006 07:15:17 +0000
(07:15 +0000)
acls.diff
patch
|
blob
|
blame
|
history
diff --git
a/acls.diff
b/acls.diff
index
56035e0
..
082803d
100644
(file)
--- a/
acls.diff
+++ b/
acls.diff
@@
-1455,13
+1455,13
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
- if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+ if (preserve_gid && file->gid != GID_NONE && sxp->st.st_gid != file->gid)
- if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+ if (preserve_gid && file->gid != GID_NONE && sxp->st.st_gid != file->gid)
-
return 0;
-
+
+
return 0;
++
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && set_acl(NULL, file, sxp) == 0)
+#ifdef SUPPORT_ACLS
+ if (preserve_acls && set_acl(NULL, file, sxp) == 0)
-
+
return 0;
+
return 0;
+#endif
+#endif
-+
+
return 1;
}
return 1;
}
@@
-2238,7
+2238,7
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
SIVAL(numbuf, 0, ndx);
--- old/lib/sysacls.c
+++ new/lib/sysacls.c
SIVAL(numbuf, 0, ndx);
--- old/lib/sysacls.c
+++ new/lib/sysacls.c
-@@ -0,0 +1,324
0
@@
+@@ -0,0 +1,324
5
@@
+/*
+ Unix SMB/CIFS implementation.
+ Samba system utilities for ACL support.
+/*
+ Unix SMB/CIFS implementation.
+ Samba system utilities for ACL support.
@@
-2263,6
+2263,11
@@
latest ACL-enabling patch to send files to an older ACL-enabled rsync.
+#include "sysacls.h" /****** ADDED ******/
+
+/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
+#include "sysacls.h" /****** ADDED ******/
+
+/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
++#ifdef DEBUG
++#undef DEBUG
++#endif
++#define DEBUG(x,y)
++
+void SAFE_FREE(void *mem)
+{
+ if (mem)
+void SAFE_FREE(void *mem)
+{
+ if (mem)