summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-06-20 20:07:13 +0000
committerJeremy Allison <jra@samba.org>2003-06-20 20:07:13 +0000
commitdeef8647c7f8f7ce286d92ff373812f9607b7375 (patch)
tree1f0b4b27aa9ea628bb5d6f3a6143f396ac4dbfe8 /source3
parent480918598b5123922f4deca301a9cf98d7e12d02 (diff)
downloadsamba-deef8647c7f8f7ce286d92ff373812f9607b7375.tar.gz
samba-deef8647c7f8f7ce286d92ff373812f9607b7375.tar.bz2
samba-deef8647c7f8f7ce286d92ff373812f9607b7375.zip
Fixed sorting algorithm to prevent problems with W2K clients.
Jeremy. (This used to be commit fa8ca20ed440673d02ac5669f8d4c6623c1fdb6d)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/posix_acls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9f15bf1560..396b955843 100644
--- 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;