ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Authors: Evan Deaubl <wine@warpedview.com>, Robert Shearman <rob@codeweavers.com> 

- Implement RtlGetControlSecurityDescriptor.
- Fix NtAccessCheck so it works with relative SECURITY_DESCRIPTORs.
This commit is contained in:
Alexandre Julliard 2005-05-31 09:32:12 +00:00
parent 3abb8e63bf
commit 5bc90f2540
1 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dlls/ntdll/sec.c
View File

@ -831,6 +831,27 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD(
return status; return status;
} }
/******************************************************************************
* RtlGetControlSecurityDescriptor (NTDLL.@)
*/
NTSTATUS WINAPI RtlGetControlSecurityDescriptor(
PSECURITY_DESCRIPTOR pSecurityDescriptor,
PSECURITY_DESCRIPTOR_CONTROL pControl,
LPDWORD lpdwRevision)
{
SECURITY_DESCRIPTOR* lpsd=pSecurityDescriptor;
TRACE("(%p,%p,%p),stub!\n",pSecurityDescriptor,pControl,lpdwRevision);
if ( !lpsd || !pControl || !lpdwRevision )
return STATUS_INVALID_PARAMETER;
*lpdwRevision = lpsd->Revision;
*pControl = lpsd->Control;
return STATUS_SUCCESS;
}
/************************************************************************** /**************************************************************************
* RtlAbsoluteToSelfRelativeSD [NTDLL.@] * RtlAbsoluteToSelfRelativeSD [NTDLL.@]
@ -1197,7 +1218,13 @@ NtAccessCheck(
SERVER_START_REQ( access_check ) SERVER_START_REQ( access_check )
{ {
struct security_descriptor sd; struct security_descriptor sd;
const SECURITY_DESCRIPTOR * RealSD = (const SECURITY_DESCRIPTOR *)SecurityDescriptor; PSID owner;
PSID group;
PACL sacl;
PACL dacl;
BOOLEAN defaulted, present;
DWORD revision;
SECURITY_DESCRIPTOR_CONTROL control;
req->handle = ClientToken; req->handle = ClientToken;
req->desired_access = DesiredAccess; req->desired_access = DesiredAccess;
@ -1207,16 +1234,22 @@ NtAccessCheck(
req->mapping_all = GenericMapping->GenericAll; req->mapping_all = GenericMapping->GenericAll;
/* marshal security descriptor */ /* marshal security descriptor */
sd.control = RealSD->Control; RtlGetControlSecurityDescriptor( SecurityDescriptor, &control, &revision );
sd.owner_len = RtlLengthSid( RealSD->Owner ); sd.control = control & ~SE_SELF_RELATIVE;
sd.group_len = RtlLengthSid( RealSD->Group ); RtlGetOwnerSecurityDescriptor( SecurityDescriptor, &owner, &defaulted );
sd.sacl_len = (RealSD->Sacl ? RealSD->Sacl->AclSize : 0); sd.owner_len = RtlLengthSid( owner );
sd.dacl_len = (RealSD->Dacl ? RealSD->Dacl->AclSize : 0); RtlGetGroupSecurityDescriptor( SecurityDescriptor, &group, &defaulted );
sd.group_len = RtlLengthSid( group );
RtlGetSaclSecurityDescriptor( SecurityDescriptor, &present, &sacl, &defaulted );
sd.sacl_len = (present ? sacl->AclSize : 0);
RtlGetDaclSecurityDescriptor( SecurityDescriptor, &present, &dacl, &defaulted );
sd.dacl_len = (present ? dacl->AclSize : 0);
wine_server_add_data( req, &sd, sizeof(sd) ); wine_server_add_data( req, &sd, sizeof(sd) );
wine_server_add_data( req, RealSD->Owner, sd.owner_len ); wine_server_add_data( req, owner, sd.owner_len );
wine_server_add_data( req, RealSD->Group, sd.group_len ); wine_server_add_data( req, group, sd.group_len );
wine_server_add_data( req, RealSD->Sacl, sd.sacl_len ); wine_server_add_data( req, sacl, sd.sacl_len );
wine_server_add_data( req, RealSD->Dacl, sd.dacl_len ); wine_server_add_data( req, dacl, sd.dacl_len );
wine_server_set_reply( req, &PrivilegeSet->Privilege, *ReturnLength - FIELD_OFFSET( PRIVILEGE_SET, Privilege ) ); wine_server_set_reply( req, &PrivilegeSet->Privilege, *ReturnLength - FIELD_OFFSET( PRIVILEGE_SET, Privilege ) );
@ -1247,19 +1280,6 @@ NtSetSecurityObject(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
/******************************************************************************
* RtlGetControlSecurityDescriptor (NTDLL.@)
*/
NTSTATUS WINAPI RtlGetControlSecurityDescriptor(
PSECURITY_DESCRIPTOR pSecurityDescriptor,
PSECURITY_DESCRIPTOR_CONTROL pControl,
LPDWORD lpdwRevision)
{
FIXME("(%p,%p,%p),stub!\n",pSecurityDescriptor,pControl,lpdwRevision);
return STATUS_SUCCESS;
}
/****************************************************************************** /******************************************************************************
* RtlConvertSidToUnicodeString (NTDLL.@) * RtlConvertSidToUnicodeString (NTDLL.@)
* *