Fixed failing hunks.

[rsync/rsync-patches.git] / adaptec_acl_mods.diff

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index 45c1e7f..9e29f35 100644 (file)
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -26,7 +26,7 @@ superfluous ACL info.
 
 --- old/lib/sysacls.c
 +++ new/lib/sysacls.c
-@@ -31,6 +31,18 @@
+@@ -30,6 +30,18 @@
  #endif
  #define DEBUG(x,y)
  
@@ -45,17 +45,17 @@ superfluous ACL info.
  void SAFE_FREE(void *mem)
  {
        if (mem)
-@@ -115,6 +127,9 @@ int sys_acl_get_access_bits(SMB_ACL_ENTR
-       if ((rc = acl_get_permset(entry_d, &permset)) != 0)
-               return rc;
-       *bits = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
-+            | (acl_get_perm(permset, ACL_CHOWN) ? 32 : 0)
-+            | (acl_get_perm(permset, ACL_CHMOD) ? 16 : 0)
-+            | (acl_get_perm(permset, ACL_DELETE) ? 8 : 0)
-             | (acl_get_perm(permset, ACL_WRITE) ? 2 : 0)
-             | (acl_get_perm(permset, ACL_EXECUTE) ? 1 : 0);
-       return 0;
-@@ -147,6 +162,12 @@ int sys_acl_set_access_bits(SMB_ACL_ENTR
+@@ -99,6 +111,9 @@ int sys_acl_get_info(SMB_ACL_ENTRY_T ent
+               return -1;
+ 
+       *bits_p = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
++              | (acl_get_perm(permset, ACL_CHOWN) ? 32 : 0)
++              | (acl_get_perm(permset, ACL_CHMOD) ? 16 : 0)
++              | (acl_get_perm(permset, ACL_DELETE) ? 8 : 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
        if ((rc = acl_get_permset(entry, &permset)) != 0)
                return rc;
        acl_clear_perms(permset);
@@ -70,7 +70,7 @@ superfluous ACL info.
        if (bits & 2)
 --- old/lib/sysacls.h
 +++ new/lib/sysacls.h
-@@ -60,8 +60,8 @@
+@@ -58,8 +58,8 @@
  #define SMB_ACL_TYPE_ACCESS   ACL_TYPE_ACCESS
  #define SMB_ACL_TYPE_DEFAULT  ACL_TYPE_DEFAULT