Accepted ACL_REVISION_DS as a valid ACL revision

N2009_11_14_FIXES
jpandre 2009-10-28 15:08:21 +00:00
parent f40b6edb32
commit 3a95774575
1 changed files with 6 additions and 4 deletions

View File

@ -635,12 +635,14 @@ BOOL ntfs_valid_descr(const char *securattr, unsigned int attrsz)
* but "Dr Watson" has SE_DACL_PRESENT though no DACL
*/
&& (!offdacl
|| ((pdacl->revision == ACL_REVISION)
&& (phead->control & SE_DACL_PRESENT)))
|| ((phead->control & SE_DACL_PRESENT)
&& ((pdacl->revision == ACL_REVISION)
|| (pdacl->revision == ACL_REVISION_DS))))
/* same for SACL */
&& (!offsacl
|| ((psacl->revision == ACL_REVISION)
&& (phead->control & SE_SACL_PRESENT)))) {
|| ((phead->control & SE_SACL_PRESENT)
&& ((psacl->revision == ACL_REVISION)
|| (psacl->revision == ACL_REVISION_DS))))) {
/*
* Check the DACL and SACL if present
*/