From: short <>
Date: Mon, 24 Mar 2003 00:04:54 +0000 (+0000)
Subject: +ntoskrnl/se/semgr.c
X-Git-Tag: captive-0_2~40
X-Git-Url: http://git.jankratochvil.net/?p=reactos.git;a=commitdiff_plain;h=e22455bb8a45beeb138ebda36dee3c946f864352

+ntoskrnl/se/semgr.c
 - +SeReleaseSubjectContext()
 - +SeCaptureSubjectContext()
---

diff --git a/ntoskrnl/se/semgr.c b/ntoskrnl/se/semgr.c
index 6102752..586c65d 100644
--- a/ntoskrnl/se/semgr.c
+++ b/ntoskrnl/se/semgr.c
@@ -31,7 +31,6 @@ static BOOLEAN SepInitExports(VOID);
 
 /* FUNCTIONS ****************************************************************/
 
-
 BOOLEAN
 SeInit1(VOID)
 {
@@ -40,8 +39,10 @@ SeInit1(VOID)
   if (!SepInitSecurityIDs())
     return(FALSE);
 
+#ifndef LIBCAPTIVE
   if (!SepInitDACLs())
     return(FALSE);
+#endif /* LIBCAPTIVE */
 
   if (!SepInitSDs())
     return(FALSE);
@@ -120,6 +121,7 @@ SepInitExports(VOID)
   return(TRUE);
 }
 
+#ifndef LIBCAPTIVE
 
 VOID SepReferenceLogonSession(PLUID AuthenticationId)
 {
@@ -227,6 +229,7 @@ NtDeleteObjectAuditAlarm(IN PUNICODE_STRING SubsystemName,
 }
 
 
+#endif /* LIBCAPTIVE */
 
 VOID STDCALL SeReleaseSubjectContext (PSECURITY_SUBJECT_CONTEXT SubjectContext)
 {
@@ -237,6 +240,7 @@ VOID STDCALL SeReleaseSubjectContext (PSECURITY_SUBJECT_CONTEXT SubjectContext)
      }   
 }
 
+
 VOID STDCALL SeCaptureSubjectContext (PSECURITY_SUBJECT_CONTEXT SubjectContext)
 {
    PEPROCESS Process;
@@ -254,6 +258,7 @@ VOID STDCALL SeCaptureSubjectContext (PSECURITY_SUBJECT_CONTEXT SubjectContext)
    SubjectContext->PrimaryToken = PsReferencePrimaryToken(Process);
 }
 
+#ifndef LIBCAPTIVE
 
 NTSTATUS STDCALL
 SeDeassignSecurity(PSECURITY_DESCRIPTOR* SecurityDescriptor)
@@ -316,8 +321,8 @@ NTSTATUS SepInheritAcl(PACL Acl,
 #endif
 
 NTSTATUS STDCALL
-SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
-		 PSECURITY_DESCRIPTOR ExplicitDescriptor,
+SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL,
+		 PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL,
 		 PSECURITY_DESCRIPTOR* NewDescriptor,
 		 BOOLEAN IsDirectoryObject,
 		 PSECURITY_SUBJECT_CONTEXT SubjectContext,
@@ -376,7 +381,7 @@ SeAssignSecurity(PSECURITY_DESCRIPTOR ParentDescriptor,
 		      GenericMapping);
      }
 #else
-  UNIMPLEMENTED;   
+  UNIMPLEMENTED;
 #endif
 }
 
@@ -497,5 +502,6 @@ SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
    return(STATUS_SUCCESS);
 }
 
+#endif /* LIBCAPTIVE */
 
 /* EOF */