Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 20:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly preserve and restore last error code in AccRewriteSetEntriesInAcl

Browse source 
svn path=/trunk/; revision=31156
This commit is contained in:
Thomas Bluemel 2007-12-11 17:49:49 +00:00
parent 39103628df
commit f4985fcee6
1 changed files with 45 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

67
reactos/dll/win32/ntmarta/ntmarta.c
View file

@ -1024,8 +1024,12 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
BOOL needToClean; BOOL needToClean;
PSID pSid1, pSid2; PSID pSid1, pSid2;
ULONG i; ULONG i;
LONG rc; BOOL bRet;
BOOL ret; DWORD LastErr;
DWORD Ret = ERROR_SUCCESS;
/* save the last error code */
LastErr = GetLastError();
*NewAcl = NULL; *NewAcl = NULL;
@ -1033,10 +1037,18 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
if (OldAcl) if (OldAcl)
{ {
if (!GetAclInformation(OldAcl, &SizeInformation, sizeof(ACL_SIZE_INFORMATION), AclSizeInformation)) if (!GetAclInformation(OldAcl, &SizeInformation, sizeof(ACL_SIZE_INFORMATION), AclSizeInformation))
return GetLastError(); {
Ret = GetLastError();
goto Cleanup;
}
pKeepAce = (BOOL *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount); pKeepAce = (BOOL *)LocalAlloc(LMEM_FIXED, SizeInformation.AceCount);
if (!pKeepAce) if (!pKeepAce)
return ERROR_NOT_ENOUGH_MEMORY; {
Ret = ERROR_NOT_ENOUGH_MEMORY;
goto Cleanup;
}
memset(pKeepAce, TRUE, SizeInformation.AceCount); memset(pKeepAce, TRUE, SizeInformation.AceCount);
} }
else else
@ -1059,7 +1071,11 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
if (!pKeepAce[i]) if (!pKeepAce[i])
continue; continue;
if (!GetAce(OldAcl, i, (PVOID*)&pAce)) if (!GetAce(OldAcl, i, (PVOID*)&pAce))
goto cleanup; {
Ret = GetLastError();
goto Cleanup;
}
pSid2 = AccpGetAceSid(pAce); pSid2 = AccpGetAceSid(pAce);
if (RtlEqualSid(pSid1, pSid2)) if (RtlEqualSid(pSid1, pSid2))
{ {
@ -1099,11 +1115,14 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
pNew = (PACL)LocalAlloc(LMEM_FIXED, SizeInformation.AclBytesInUse); pNew = (PACL)LocalAlloc(LMEM_FIXED, SizeInformation.AclBytesInUse);
if (!pNew) if (!pNew)
{ {
rc = ERROR_NOT_ENOUGH_MEMORY; Ret = ERROR_NOT_ENOUGH_MEMORY;
goto done; goto Cleanup;
} }
if (!InitializeAcl(pNew, SizeInformation.AclBytesInUse, ACL_REVISION)) if (!InitializeAcl(pNew, SizeInformation.AclBytesInUse, ACL_REVISION))
goto cleanup; {
Ret = GetLastError();
goto Cleanup;
}
/* Fill it */ /* Fill it */
/* 1a) New audit entries (SET_AUDIT_SUCCESS, SET_AUDIT_FAILURE) */ /* 1a) New audit entries (SET_AUDIT_SUCCESS, SET_AUDIT_FAILURE) */
@ -1119,10 +1138,13 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
{ {
/* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */
pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean);
ret = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); bRet = AddAccessDeniedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1);
if (needToClean) LocalFree((HLOCAL)pSid1); if (needToClean) LocalFree((HLOCAL)pSid1);
if (!ret) if (!bRet)
goto cleanup; {
Ret = GetLastError();
goto Cleanup;
}
} }
} }
@ -1137,10 +1159,13 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
{ {
/* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */ /* FIXME: take care of pListOfExplicitEntries[i].grfInheritance */
pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean); pSid1 = GetTrusteeSid(&pListOfExplicitEntries[i].Trustee, &needToClean);
ret = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1); bRet = AddAccessAllowedAce(pNew, ACL_REVISION, pListOfExplicitEntries[i].grfAccessPermissions, pSid1);
if (needToClean) LocalFree((HLOCAL)pSid1); if (needToClean) LocalFree((HLOCAL)pSid1);
if (!ret) if (!bRet)
goto cleanup; {
Ret = GetLastError();
goto Cleanup;
}
} }
} }
@ -1148,17 +1173,15 @@ AccRewriteSetEntriesInAcl(ULONG cCountOfExplicitEntries,
/* FIXME */ /* FIXME */
*NewAcl = pNew; *NewAcl = pNew;
rc = ERROR_SUCCESS;
goto done;
cleanup: Cleanup:
rc = GetLastError();
done:
if (pKeepAce) if (pKeepAce)
LocalFree((HLOCAL)pKeepAce); LocalFree((HLOCAL)pKeepAce);
DPRINT("Returning %d\n", rc);
return rc; /* restore the last error code */
SetLastError(LastErr);
return Ret;
} }