Author: tfaber Date: Sat Apr 21 06:35:45 2012 New Revision: 56376
URL: http://svn.reactos.org/svn/reactos?rev=56376&view=rev Log: [NTOSKRNL] - Export SeTokenObjectType
Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/ntoskrnl/se/token.c
Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/s... ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -1,6 +1,4 @@ #pragma once - -extern POBJECT_TYPE SepTokenObjectType;
/* SID Authorities */ extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority;
Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -1384,6 +1384,7 @@ @ stdcall SeTokenIsAdmin(ptr) @ stdcall SeTokenIsRestricted(ptr) @ stdcall SeTokenIsWriteRestricted(ptr) +@ extern SeTokenObjectType @ stdcall SeTokenType(ptr) @ stdcall SeUnlockSubjectContext(ptr) @ stdcall SeUnregisterLogonSessionTerminatedRoutine(ptr)
Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -190,7 +190,7 @@ /* Reference it from the handle */ Status = ObReferenceObjectByHandle(Token, TOKEN_ASSIGN_PRIMARY, - SepTokenObjectType, + SeTokenObjectType, ExGetPreviousMode(), &NewToken, NULL); @@ -231,7 +231,7 @@ /* Reference it */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_ASSIGN_PRIMARY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&NewToken, NULL); @@ -380,7 +380,7 @@ HandleAttributes, NULL, DesiredAccess, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, &hToken); ObDereferenceObject(Token); @@ -494,7 +494,7 @@ /* Get the token object */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_IMPERSONATE, - SepTokenObjectType, + SeTokenObjectType, KeGetPreviousMode(), (PVOID*)&Token, NULL);
Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=5637... ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -531,7 +531,7 @@ not doing an anonymous impersonation */ Status = ObReferenceObjectByHandle(ClientToken, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL);
Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=563... ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -947,7 +947,7 @@ /* Reference the token */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL);
Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=563... ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -19,7 +19,7 @@
/* GLOBALS ********************************************************************/
-POBJECT_TYPE SepTokenObjectType = NULL; +POBJECT_TYPE SeTokenObjectType = NULL; ERESOURCE SepTokenLock;
TOKEN_SOURCE SeSystemTokenSource = {"*SYSTEM*", {0}}; @@ -240,7 +240,7 @@ PAGED_CODE();
Status = ObCreateObject(PreviousMode, - SepTokenObjectType, + SeTokenObjectType, ObjectAttributes, PreviousMode, NULL, @@ -494,7 +494,7 @@ ObjectTypeInitializer.ValidAccessMask = TOKEN_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = SepDeleteToken; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &SepTokenObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &SeTokenObjectType); }
VOID @@ -588,7 +588,7 @@ return Status;
Status = ObCreateObject(PreviousMode, - SepTokenObjectType, + SeTokenObjectType, ObjectAttributes, PreviousMode, NULL, @@ -1035,7 +1035,7 @@
Status = ObReferenceObjectByHandle(TokenHandle, (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); @@ -1602,7 +1602,7 @@
Status = ObReferenceObjectByHandle(TokenHandle, NeededAccess, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); @@ -1845,7 +1845,7 @@
Status = ObReferenceObjectByHandle(ExistingTokenHandle, TOKEN_DUPLICATE, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, &HandleInformation); @@ -2047,7 +2047,7 @@ /* Reference the token */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); @@ -2474,7 +2474,7 @@ else { Status = ObOpenObjectByPointer(Token, HandleAttributes, - NULL, DesiredAccess, SepTokenObjectType, + NULL, DesiredAccess, SeTokenObjectType, PreviousMode, &hToken); }
@@ -2561,7 +2561,7 @@
Status = ObReferenceObjectByHandle(FirstTokenHandle, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&FirstToken, NULL); @@ -2570,7 +2570,7 @@
Status = ObReferenceObjectByHandle(SecondTokenHandle, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&SecondToken, NULL);