ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

SeCaptureSecurityDescriptor: instead of first copying the relative offsets of a SECURITY_DESCRIPTOR_RELATIVE into the pointer fields of a SECURITY_DESCRIPTOR and later adding the base pointer, do it directly as the code already needs to handle relative and absolute structures differently before.

Browse Source 
svn path=/branches/ros-amd64-bringup/; revision=44276
This commit is contained in:
Timo Kreuzer
2009-11-23 21:52:18 +00:00
parent c6aa60e093
commit a78c631dcd
1 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/ntoskrnl/se/sd.c
+8 -32
View File
@@ -436,10 +436,10 @@ SeCaptureSecurityDescriptor(IN PSECURITY_DESCRIPTOR _OriginalSecurityDescriptor,
{
PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)OriginalSecurityDescriptor;
DescriptorCopy.Owner = (PSID)RelSD->Owner;
DescriptorCopy.Group = (PSID)RelSD->Group;
DescriptorCopy.Sacl = (PACL)RelSD->Sacl;
DescriptorCopy.Dacl = (PACL)RelSD->Dacl;
DescriptorCopy.Owner = (PSID)((PCHAR)RelSD + RelSD->Owner);
DescriptorCopy.Group = (PSID)((PCHAR)RelSD + RelSD->Group);
DescriptorCopy.Sacl = (PACL)((PCHAR)RelSD + RelSD->Sacl);
DescriptorCopy.Dacl = (PACL)((PCHAR)RelSD + RelSD->Dacl);
}
else
{
@@ -483,10 +483,10 @@ SeCaptureSecurityDescriptor(IN PSECURITY_DESCRIPTOR _OriginalSecurityDescriptor,
{
PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)OriginalSecurityDescriptor;
DescriptorCopy.Owner = (PSID)RelSD->Owner;
DescriptorCopy.Group = (PSID)RelSD->Group;
DescriptorCopy.Sacl = (PACL)RelSD->Sacl;
DescriptorCopy.Dacl = (PACL)RelSD->Dacl;
DescriptorCopy.Owner = (PSID)((PCHAR)RelSD + RelSD->Owner);
DescriptorCopy.Group = (PSID)((PCHAR)RelSD + RelSD->Group);
DescriptorCopy.Sacl = (PACL)((PCHAR)RelSD + RelSD->Sacl);
DescriptorCopy.Dacl = (PACL)((PCHAR)RelSD + RelSD->Dacl);
}
else
{
@@ -497,30 +497,6 @@ SeCaptureSecurityDescriptor(IN PSECURITY_DESCRIPTOR _OriginalSecurityDescriptor,
}
}
if(DescriptorCopy.Control & SE_SELF_RELATIVE)
{
/* in case we're dealing with a self-relative descriptor, do a basic convert
to an absolute descriptor. We do this so we can simply access the data
using the pointers without calculating them again. */
DescriptorCopy.Control &= ~SE_SELF_RELATIVE;
if(DescriptorCopy.Owner != NULL)
{
DescriptorCopy.Owner = (PSID)((ULONG_PTR)OriginalSecurityDescriptor + (ULONG_PTR)DescriptorCopy.Owner);
}
if(DescriptorCopy.Group != NULL)
{
DescriptorCopy.Group = (PSID)((ULONG_PTR)OriginalSecurityDescriptor + (ULONG_PTR)DescriptorCopy.Group);
}
if(DescriptorCopy.Dacl != NULL)
{
DescriptorCopy.Dacl = (PACL)((ULONG_PTR)OriginalSecurityDescriptor + (ULONG_PTR)DescriptorCopy.Dacl);
}
if(DescriptorCopy.Sacl != NULL)
{
DescriptorCopy.Sacl = (PACL)((ULONG_PTR)OriginalSecurityDescriptor + (ULONG_PTR)DescriptorCopy.Sacl);
}
}
/* determine the size of the SIDs */
#define DetermineSIDSize(SidType) \
do { \