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.0pre6.
[rsync/rsync-patches.git]
/
adaptec_acl_mods.diff
diff --git
a/adaptec_acl_mods.diff
b/adaptec_acl_mods.diff
index
9e29f35
..
c79da0a
100644
(file)
--- a/
adaptec_acl_mods.diff
+++ b/
adaptec_acl_mods.diff
@@
-24,8
+24,9
@@
Todo:
Fix a bug that could lose some bits when stripping some (supposedly)
superfluous ACL info.
Fix a bug that could lose some bits when stripping some (supposedly)
superfluous ACL info.
---- old/lib/sysacls.c
-+++ new/lib/sysacls.c
+diff --git a/lib/sysacls.c b/lib/sysacls.c
+--- a/lib/sysacls.c
++++ b/lib/sysacls.c
@@ -30,6 +30,18 @@
#endif
#define DEBUG(x,y)
@@ -30,6 +30,18 @@
#endif
#define DEBUG(x,y)
@@
-45,7
+46,7
@@
superfluous ACL info.
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 ent
+@@ -99,6 +111,9 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T ent
ry, 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)
@@
-55,7
+56,7
@@
superfluous ACL info.
| (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);
-@@ -143,6 +158,12 @@ int sys_acl_set_access_bits(SMB_ACL_ENTR
+@@ -143,6 +158,12 @@ int sys_acl_set_access_bits(SMB_ACL_ENTR
Y_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);
@@
-68,8
+69,9
@@
superfluous ACL info.
if (bits & 4)
acl_add_perm(permset, ACL_READ);
if (bits & 2)
if (bits & 4)
acl_add_perm(permset, ACL_READ);
if (bits & 2)
---- old/lib/sysacls.h
-+++ new/lib/sysacls.h
+diff --git a/lib/sysacls.h b/lib/sysacls.h
+--- a/lib/sysacls.h
++++ b/lib/sysacls.h
@@ -58,8 +58,8 @@
#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT
@@ -58,8 +58,8 @@
#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS
#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT