Fixed a failing hunk.

diff --git a/adaptec_acl_mods.diff b/adaptec_acl_mods.diff
index cfc0c28..0ae772c 100644 (file)
--- a/adaptec_acl_mods.diff
+++ b/adaptec_acl_mods.diff
@@ -56,7 +56,7 @@ entry.
                       | (sys_acl_get_perm(permset, SMB_ACL_EXECUTE) ? 1 : 0);
                /* continue == done with entry; break == store in given idal */
                switch (tag_type) {
-@@ -588,6 +591,12 @@ static int store_access_in_entry(uchar a
+@@ -587,6 +590,12 @@ static int store_access_in_entry(uchar a
  
        COE( sys_acl_get_permset,(entry, &permset) );
        COE( sys_acl_clear_perms,(permset) );
@@ -69,7 +69,7 @@ entry.
        if (access & 4)
                COE( sys_acl_add_perm,(permset, SMB_ACL_READ) );
        if (access & 2)
-@@ -620,7 +629,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -619,7 +628,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) );
@@ -78,7 +78,7 @@ entry.
  
        for (ida = racl->users.idas, count = racl->users.count;
             count--; ida++) {
-@@ -632,7 +641,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -631,7 +640,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) );
@@ -87,7 +87,7 @@ entry.
  
        for (ida = racl->groups.idas, count = racl->groups.count;
             count--; ida++) {
-@@ -653,7 +662,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_
+@@ -652,7 +661,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) );
@@ -96,7 +96,7 @@ entry.
  
  #ifdef DEBUG
        if (sys_acl_valid(*smb_acl) < 0)
-@@ -762,7 +771,7 @@ static void receive_rsync_acl(rsync_acl 
+@@ -761,7 +770,7 @@ static void receive_rsync_acl(rsync_acl 
        while (count--) {
                char tag = read_byte(f);
                uchar access = read_byte(f);
@@ -105,10 +105,10 @@ entry.
                        rprintf(FERROR, "receive_rsync_acl: bogus permset %o\n",
                                access);
                        exit_cleanup(RERR_STREAMIO);
-@@ -835,7 +844,7 @@ static void receive_rsync_acl(rsync_acl 
+@@ -834,7 +843,7 @@ static void receive_rsync_acl(rsync_acl 
        } else
  #endif
-       if (racl->mask == ACL_NO_ENTRY) /* always made non-empty when needed */
+       if (racl->mask == ACL_NO_ENTRY) /* Always non-empty when needed. */
 -              racl->mask = computed_mask_bits | (racl->group_obj & 7);
 +              racl->mask = computed_mask_bits | (racl->group_obj & 077);
  }