* flock.cc (allow_others_to_sync): Reorder conditional expression to

check for DACL presence first, since otherwise dacl pointer value is
	undefined.  Add comment.
This commit is contained in:
Corinna Vinschen 2012-03-02 17:20:11 +00:00
parent b4ad7197fb
commit 56bed67046
2 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2012-03-02 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (allow_others_to_sync): Reorder conditional expression to
check for DACL presence first, since otherwise dacl pointer value is
undefined. Add comment.
2012-03-02 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (allow_others_to_sync): Use RtlGetDaclSecurityDescriptor

View File

@ -178,16 +178,16 @@ allow_others_to_sync ()
is in self-relative format. */
BOOLEAN present, defaulted;
RtlGetDaclSecurityDescriptor (sd, &present, &dacl, &defaulted);
if (dacl == NULL) /* Everyone has all access anyway */
{
done = true;
return;
}
else if (!present)
if (!present) /* If so, dacl has undefined value. */
{
dacl = (PACL) (sd + 1);
RtlCreateAcl (dacl, MAX_PROCESS_SD_SIZE - sizeof *sd, ACL_REVISION);
}
else if (dacl == NULL) /* Everyone has all access anyway */
{
done = true;
return;
}
else
{
dacl->AclSize = MAX_PROCESS_SD_SIZE - ((PBYTE) dacl - (PBYTE) sd);