mirror of
https://github.com/reactos/reactos.git
synced 2024-06-29 01:12:06 +00:00
[NTOS:SE] Do some cleanup on ICIF flags in token information classes
A few of these classes have fixed size lengths, the rest are arbitrary. Also the TokenAuditPolicy class hasn't a size length type specified in the table, which is wrong (and move the corresponding TOKEN_AUDIT_POLICY_INFORMATION structure into the private header).
This commit is contained in:
parent
d21adc9b31
commit
3140dac3fe
|
@ -24,6 +24,16 @@ typedef struct _KNOWN_COMPOUND_ACE
|
|||
ULONG SidStart;
|
||||
} KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE;
|
||||
|
||||
typedef struct _TOKEN_AUDIT_POLICY_INFORMATION
|
||||
{
|
||||
ULONG PolicyCount;
|
||||
struct
|
||||
{
|
||||
ULONG Category;
|
||||
UCHAR Value;
|
||||
} Policies[1];
|
||||
} TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION;
|
||||
|
||||
FORCEINLINE
|
||||
PSID
|
||||
SepGetGroupFromDescriptor(PVOID _Descriptor)
|
||||
|
|
|
@ -14,16 +14,6 @@
|
|||
|
||||
#include <ntlsa.h>
|
||||
|
||||
typedef struct _TOKEN_AUDIT_POLICY_INFORMATION
|
||||
{
|
||||
ULONG PolicyCount;
|
||||
struct
|
||||
{
|
||||
ULONG Category;
|
||||
UCHAR Value;
|
||||
} Policies[1];
|
||||
} TOKEN_AUDIT_POLICY_INFORMATION, *PTOKEN_AUDIT_POLICY_INFORMATION;
|
||||
|
||||
/* GLOBALS ********************************************************************/
|
||||
|
||||
POBJECT_TYPE SeTokenObjectType = NULL;
|
||||
|
@ -45,25 +35,25 @@ static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = {
|
|||
IQS_SAME(0, 0, 0),
|
||||
|
||||
/* TokenUser */
|
||||
IQS_SAME(TOKEN_USER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_USER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenGroups */
|
||||
IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenPrivileges */
|
||||
IQS_SAME(TOKEN_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenOwner */
|
||||
IQS_SAME(TOKEN_OWNER, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_OWNER, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE),
|
||||
/* TokenPrimaryGroup */
|
||||
IQS_SAME(TOKEN_PRIMARY_GROUP, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_PRIMARY_GROUP, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE),
|
||||
/* TokenDefaultDacl */
|
||||
IQS_SAME(TOKEN_DEFAULT_DACL, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_DEFAULT_DACL, ULONG, ICIF_QUERY | ICIF_SET | ICIF_SIZE_VARIABLE),
|
||||
/* TokenSource */
|
||||
IQS_SAME(TOKEN_SOURCE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_SOURCE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenType */
|
||||
IQS_SAME(TOKEN_TYPE, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenImpersonationLevel */
|
||||
IQS_SAME(SECURITY_IMPERSONATION_LEVEL, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
IQS_SAME(SECURITY_IMPERSONATION_LEVEL, ULONG, ICIF_QUERY),
|
||||
/* TokenStatistics */
|
||||
IQS_SAME(TOKEN_STATISTICS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_STATISTICS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenRestrictedSids */
|
||||
IQS_SAME(TOKEN_GROUPS, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenSessionId */
|
||||
|
@ -71,13 +61,13 @@ static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = {
|
|||
/* TokenGroupsAndPrivileges */
|
||||
IQS_SAME(TOKEN_GROUPS_AND_PRIVILEGES, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
/* TokenSessionReference */
|
||||
IQS_SAME(ULONG, ULONG, ICIF_SET | ICIF_QUERY_SIZE_VARIABLE),
|
||||
IQS_SAME(ULONG, ULONG, ICIF_SET),
|
||||
/* TokenSandBoxInert */
|
||||
IQS_SAME(ULONG, ULONG, ICIF_QUERY | ICIF_QUERY_SIZE_VARIABLE),
|
||||
IQS_SAME(ULONG, ULONG, ICIF_QUERY),
|
||||
/* TokenAuditPolicy */
|
||||
IQS_SAME(/* FIXME */0, ULONG, ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_AUDIT_POLICY_INFORMATION, ULONG, ICIF_SET | ICIF_SET_SIZE_VARIABLE),
|
||||
/* TokenOrigin */
|
||||
IQS_SAME(TOKEN_ORIGIN, ULONG, ICIF_QUERY | ICIF_SET | ICIF_QUERY_SIZE_VARIABLE),
|
||||
IQS_SAME(TOKEN_ORIGIN, ULONG, ICIF_QUERY | ICIF_SET),
|
||||
};
|
||||
|
||||
/* FUNCTIONS *****************************************************************/
|
||||
|
|
Loading…
Reference in a new issue