Fixed sorting algorithm to prevent problems with W2K clients.

Jeremy.
(This used to be commit fa8ca20ed440673d02ac5669f8d4c6623c1fdb6d)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9f15bf15601fa5f44ac9635fe065f9b25dd7f59d..396b955843a45c056c8c247f96bb3342eeb86796 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -2172,8 +2172,6 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
        if (!ensure_canon_entry_valid(&list_head, fsp, powner, pgroup, psbuf, False))
                goto fail;
 
-       arrange_posix_perms(fsp->fsp_name,&list_head );
-
        /*
         * Now go through the list, masking the permissions with the
         * acl_mask. Ensure all DENY Entries are at the start of the list.
@@ -2197,6 +2195,8 @@ static canon_ace *canonicalise_acl( files_struct *fsp, SMB_ACL_T posix_acl, SMB_
                }
        }
 
+       arrange_posix_perms(fsp->fsp_name,&list_head );
+
        print_canon_ace_list( "canonicalise_acl: ace entries after arrange", list_head );
 
        return list_head;