diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h index 2f4c953620c..47989ba6b65 100755 --- a/reactos/include/ntos/zw.h +++ b/reactos/include/ntos/zw.h @@ -1,5 +1,5 @@ -/* $Id: zw.h,v 1.13 2003/07/12 10:24:45 chorns Exp $ +/* $Id: zw.h,v 1.14 2003/07/20 22:09:46 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -4274,7 +4274,9 @@ RtlOpenCurrentUser( * ARGUMENTS: * SubsystemName = Specifies the name of the subsystem, can be "WIN32" or "DEBUG" * ObjectHandle = - * ObjectAttributes = + * ObjectTypeName = + * ObjectName = + * SecurityDescriptor = * DesiredAcces = * GenericMapping = * ObjectCreation = @@ -4290,12 +4292,14 @@ STDCALL NtAccessCheckAndAuditAlarm( IN PUNICODE_STRING SubsystemName, IN PHANDLE ObjectHandle, - IN POBJECT_ATTRIBUTES ObjectAttributes, + IN PUNICODE_STRING ObjectTypeName, + IN PUNICODE_STRING ObjectName, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN ACCESS_MASK DesiredAccess, IN PGENERIC_MAPPING GenericMapping, IN BOOLEAN ObjectCreation, - OUT PULONG GrantedAccess, - OUT PBOOLEAN AccessStatus, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus, OUT PBOOLEAN GenerateOnClose ); @@ -4530,16 +4534,18 @@ NtLockVirtualMemory( NTSTATUS STDCALL NtOpenObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN ULONG GrantedAccess, + IN PUNICODE_STRING SubsystemName, + IN PVOID HandleId, + IN PUNICODE_STRING ObjectTypeName, + IN PUNICODE_STRING ObjectName, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN HANDLE ClientToken, + IN ULONG DesiredAccess, + IN ULONG GrantedAccess, IN PPRIVILEGE_SET Privileges, - IN BOOLEAN ObjectCreation, - IN BOOLEAN AccessGranted, - OUT PBOOLEAN GenerateOnClose + IN BOOLEAN ObjectCreation, + IN BOOLEAN AccessGranted, + OUT PBOOLEAN GenerateOnClose ); /* @@ -4890,7 +4896,9 @@ ZwDuplicateObject( * ARGUMENTS: * SubsystemName = Specifies the name of the subsystem, can be "WIN32" or "DEBUG" * ObjectHandle = - * ObjectAttributes = + * ObjectTypeName = + * ObjectName = + * SecurityDescriptor = * DesiredAcces = * GenericMapping = * ObjectCreation = @@ -4906,12 +4914,14 @@ STDCALL ZwAccessCheckAndAuditAlarm( IN PUNICODE_STRING SubsystemName, IN PHANDLE ObjectHandle, - IN POBJECT_ATTRIBUTES ObjectAttributes, + IN PUNICODE_STRING ObjectTypeName, + IN PUNICODE_STRING ObjectName, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN ACCESS_MASK DesiredAccess, IN PGENERIC_MAPPING GenericMapping, IN BOOLEAN ObjectCreation, - OUT PULONG GrantedAccess, - OUT PBOOLEAN AccessStatus, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus, OUT PBOOLEAN GenerateOnClose ); @@ -5141,16 +5151,18 @@ ZwLockVirtualMemory( NTSTATUS STDCALL ZwOpenObjectAuditAlarm( - IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN ULONG GrantedAccess, + IN PUNICODE_STRING SubsystemName, + IN PVOID HandleId, + IN PUNICODE_STRING ObjectTypeName, + IN PUNICODE_STRING ObjectName, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN HANDLE ClientToken, + IN ULONG DesiredAccess, + IN ULONG GrantedAccess, IN PPRIVILEGE_SET Privileges, - IN BOOLEAN ObjectCreation, - IN BOOLEAN AccessGranted, - OUT PBOOLEAN GenerateOnClose + IN BOOLEAN ObjectCreation, + IN BOOLEAN AccessGranted, + OUT PBOOLEAN GenerateOnClose ); /* diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile index 922665a54d5..52fcedee049 100644 --- a/reactos/ntoskrnl/Makefile +++ b/reactos/ntoskrnl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.101 2003/07/15 16:26:18 silverblade Exp $ +# $Id: Makefile,v 1.102 2003/07/20 22:10:38 ekohl Exp $ # # ReactOS Operating System # @@ -269,6 +269,7 @@ OBJECTS_FS = \ OBJECTS_SE = \ se/access.o \ se/acl.o \ + se/audit.o \ se/lsa.o \ se/luid.o \ se/priv.o \ diff --git a/reactos/ntoskrnl/se/audit.c b/reactos/ntoskrnl/se/audit.c new file mode 100644 index 00000000000..f15d0fdf9ae --- /dev/null +++ b/reactos/ntoskrnl/se/audit.c @@ -0,0 +1,97 @@ +/* $Id: audit.c,v 1.1 2003/07/20 22:10:23 ekohl Exp $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Audit functions + * FILE: kernel/se/audit.c + * PROGRAMER: Eric Kohl (ekohl@rz-online.de) + * REVISION HISTORY: + * 20/07/2003: Created + */ + +/* INCLUDES *****************************************************************/ + +#include + +#include + + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS STDCALL +NtAccessCheckAndAuditAlarm(IN PUNICODE_STRING SubsystemName, + IN PHANDLE ObjectHandle, + IN PUNICODE_STRING ObjectTypeName, + IN PUNICODE_STRING ObjectName, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ACCESS_MASK DesiredAccess, + IN PGENERIC_MAPPING GenericMapping, + IN BOOLEAN ObjectCreation, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus, + OUT PBOOLEAN GenerateOnClose + ) +{ + UNIMPLEMENTED; +} + + +NTSTATUS STDCALL +NtCloseObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, + IN PVOID HandleId, + IN BOOLEAN GenerateOnClose) +{ + UNIMPLEMENTED; +} + + +NTSTATUS STDCALL +NtDeleteObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, + IN PVOID HandleId, + IN BOOLEAN GenerateOnClose) +{ + UNIMPLEMENTED; +} + + +NTSTATUS STDCALL +NtOpenObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, + IN PVOID HandleId, + IN PUNICODE_STRING ObjectTypeName, + IN PUNICODE_STRING ObjectName, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN HANDLE ClientToken, + IN ULONG DesiredAccess, + IN ULONG GrantedAccess, + IN PPRIVILEGE_SET Privileges, + IN BOOLEAN ObjectCreation, + IN BOOLEAN AccessGranted, + OUT PBOOLEAN GenerateOnClose) +{ + UNIMPLEMENTED; +} + + +NTSTATUS STDCALL +NtPrivilegedServiceAuditAlarm(IN PUNICODE_STRING SubsystemName, + IN PUNICODE_STRING ServiceName, + IN HANDLE ClientToken, + IN PPRIVILEGE_SET Privileges, + IN BOOLEAN AccessGranted) +{ + UNIMPLEMENTED; +} + + +NTSTATUS STDCALL +NtPrivilegeObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, + IN PVOID HandleId, + IN HANDLE ClientToken, + IN ULONG DesiredAccess, + IN PPRIVILEGE_SET Privileges, + IN BOOLEAN AccessGranted) +{ + UNIMPLEMENTED; +} + +/* EOF */ diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c index 7471f2c0f32..602d343f0cf 100644 --- a/reactos/ntoskrnl/se/semgr.c +++ b/reactos/ntoskrnl/se/semgr.c @@ -1,4 +1,4 @@ -/* $Id: semgr.c,v 1.25 2003/07/11 01:23:16 royce Exp $ +/* $Id: semgr.c,v 1.26 2003/07/20 22:10:23 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -186,59 +186,6 @@ VOID SepDeReferenceLogonSession(PLUID AuthenticationId) UNIMPLEMENTED; } -NTSTATUS STDCALL -NtPrivilegedServiceAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PUNICODE_STRING ServiceName, - IN HANDLE ClientToken, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted) -{ - UNIMPLEMENTED; -} - - -NTSTATUS STDCALL -NtPrivilegeObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN AccessGranted) -{ - UNIMPLEMENTED; -} - - -NTSTATUS STDCALL -NtOpenObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE ClientToken, - IN ULONG DesiredAccess, - IN ULONG GrantedAccess, - IN PPRIVILEGE_SET Privileges, - IN BOOLEAN ObjectCreation, - IN BOOLEAN AccessGranted, - OUT PBOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; -} - - -NTSTATUS STDCALL -NtAccessCheckAndAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PHANDLE ObjectHandle, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - IN BOOLEAN ObjectCreation, - OUT PULONG GrantedAccess, - OUT PBOOLEAN AccessStatus, - OUT PBOOLEAN GenerateOnClose - ) -{ - UNIMPLEMENTED; -} /* @@ -253,15 +200,6 @@ NtAllocateUuids(PULARGE_INTEGER Time, } -NTSTATUS STDCALL -NtCloseObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; -} - - NTSTATUS STDCALL NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN HANDLE ClientToken, @@ -276,16 +214,6 @@ NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, } -NTSTATUS STDCALL -NtDeleteObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; -} - - - /* * @implemented */