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.0.
[rsync/rsync-patches.git]
/
adaptec_acl_mods.diff
diff --git
a/adaptec_acl_mods.diff
b/adaptec_acl_mods.diff
index
c79da0a
..
d668246
100644
(file)
--- a/
adaptec_acl_mods.diff
+++ b/
adaptec_acl_mods.diff
@@
-27,7
+27,7
@@
superfluous ACL info.
diff --git a/lib/sysacls.c b/lib/sysacls.c
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
diff --git a/lib/sysacls.c b/lib/sysacls.c
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
-@@ -3
0,6 +30
,18 @@
+@@ -3
1,6 +31
,18 @@
#endif
#define DEBUG(x,y)
#endif
#define DEBUG(x,y)
@@
-46,7
+46,7
@@
diff --git a/lib/sysacls.c b/lib/sysacls.c
void SAFE_FREE(void *mem)
{
if (mem)
void SAFE_FREE(void *mem)
{
if (mem)
-@@ -
99,6 +111
,9 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b
+@@ -
100,6 +112
,9 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *b
return -1;
*bits_p = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
return -1;
*bits_p = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
@@
-56,7
+56,7
@@
diff --git a/lib/sysacls.c b/lib/sysacls.c
| (acl_get_perm(permset, ACL_WRITE) ? 2 : 0)
| (acl_get_perm(permset, ACL_EXECUTE) ? 1 : 0);
| (acl_get_perm(permset, ACL_WRITE) ? 2 : 0)
| (acl_get_perm(permset, ACL_EXECUTE) ? 1 : 0);
-@@ -14
3,6 +158
,12 @@ int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
+@@ -14
4,6 +159
,12 @@ int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
if ((rc = acl_get_permset(entry, &permset)) != 0)
return rc;
acl_clear_perms(permset);
if ((rc = acl_get_permset(entry, &permset)) != 0)
return rc;
acl_clear_perms(permset);
@@
-72,7
+72,7
@@
diff --git a/lib/sysacls.c b/lib/sysacls.c
diff --git a/lib/sysacls.h b/lib/sysacls.h
--- a/lib/sysacls.h
+++ b/lib/sysacls.h
diff --git a/lib/sysacls.h b/lib/sysacls.h
--- a/lib/sysacls.h
+++ b/lib/sysacls.h
-@@ -5
8,8 +58
,8 @@
+@@ -5
9,8 +59
,8 @@
#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT