Fixed failing hunks.

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

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index 60b76f5..f0325a3 100644 (file)
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -30,7 +30,7 @@ entry.
 
 --- old/acls.c
 +++ new/acls.c
-@@ -307,6 +307,9 @@ static BOOL unpack_smb_acl(SMB_ACL_T sac
+@@ -306,6 +306,9 @@ static BOOL unpack_smb_acl(SMB_ACL_T sac
                }
                access = (sys_acl_get_perm(permset, SMB_ACL_READ) ? 4 : 0)
                       | (sys_acl_get_perm(permset, SMB_ACL_WRITE) ? 2 : 0)
@@ -40,7 +40,7 @@ entry.
                       | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
                /* continue == done with entry; break == store in temporary ida list */
                switch (tag_type) {
-@@ -401,6 +404,12 @@ static int store_access_in_entry(uchar a
+@@ -400,6 +403,12 @@ static int store_access_in_entry(uchar a
  
        COE( sys_acl_get_permset,(entry, &permset) );
        COE( sys_acl_clear_perms,(permset) );
@@ -53,7 +53,7 @@ entry.
        if (access & 4)
                COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
        if (access & 2)
-@@ -434,7 +443,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -433,7 +442,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
  
        COE( sys_acl_create_entry,(smb_acl, &entry) );
        COE( sys_acl_set_tag_type,(entry, SMB_ACL_USER_OBJ) );
@@ -62,7 +62,7 @@ entry.
  
        for (ida = racl->users.idas, count = racl->users.count; count--; ida++) {
                COE( sys_acl_create_entry,(smb_acl, &entry) );
-@@ -445,7 +454,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -444,7 +453,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
  
        COE( sys_acl_create_entry,(smb_acl, &entry) );
        COE( sys_acl_set_tag_type,(entry, SMB_ACL_GROUP_OBJ) );
@@ -71,7 +71,7 @@ entry.
  
        for (ida = racl->groups.idas, count = racl->groups.count; count--; ida++) {
                COE( sys_acl_create_entry,(smb_acl, &entry) );
-@@ -455,7 +464,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -454,7 +463,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
        }
  
  #ifdef ACLS_NEED_MASK
@@ -80,7 +80,7 @@ entry.
        COE( sys_acl_create_entry,(smb_acl, &entry) );
        COE( sys_acl_set_tag_type,(entry, SMB_ACL_MASK) );
        COE2( store_access_in_entry,(mask_bits, entry) );
-@@ -469,7 +478,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -468,7 +477,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
  
        COE( sys_acl_create_entry,(smb_acl, &entry) );
        COE( sys_acl_set_tag_type,(entry, SMB_ACL_OTHER) );
@@ -89,7 +89,7 @@ entry.
  
  #ifdef DEBUG
        if (sys_acl_valid(*smb_acl) < 0)
-@@ -766,7 +775,7 @@ static void old_recv_rsync_acl(rsync_acl
+@@ -765,7 +774,7 @@ static void old_recv_rsync_acl(rsync_acl
        while (count--) {
                char tag = read_byte(f);
                uchar access = read_byte(f);
@@ -98,7 +98,7 @@ entry.
                        rprintf(FERROR, "old_recv_rsync_acl: bogus permset %o\n",
                                access);
                        exit_cleanup(RERR_STREAMIO);
-@@ -832,7 +841,7 @@ static void old_recv_rsync_acl(rsync_acl
+@@ -831,7 +840,7 @@ static void old_recv_rsync_acl(rsync_acl
                        racl->mask_obj = NO_ENTRY;
                }
        } else if (racl->mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
@@ -107,7 +107,7 @@ entry.
  }
  
  /* Receive the ACL info the sender has included for this file-list entry. */
-@@ -904,7 +913,7 @@ static uchar recv_acl_access(uchar *name
+@@ -903,7 +912,7 @@ static uchar recv_acl_access(uchar *name
                        *name_follows_val = 0;
        }
  
@@ -116,9 +116,9 @@ entry.
                rprintf(FERROR, "recv_acl_access: bogus permset %o\n", access);
                exit_cleanup(RERR_STREAMIO);
        }
---- old/smb_acls.h
-+++ new/smb_acls.h
-@@ -33,6 +33,11 @@
+--- old/lib/sysacls.h
++++ new/lib/sysacls.h
+@@ -45,6 +45,11 @@
  #define SMB_ACL_READ          ACL_READ
  #define SMB_ACL_WRITE         ACL_WRITE
  #define SMB_ACL_EXECUTE               ACL_EXECUTE