From 44d57334de6e0a2aefb06884f71f69288dc24702 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 9 Dec 2017 13:29:58 +0100 Subject: [PATCH] [LSASRV] Deduplicate SAMPR_ULONG_ARRAY. --- dll/win32/lsasrv/authpackage.c | 6 ------ dll/win32/lsasrv/lookup.c | 7 ------- dll/win32/lsasrv/lsasrv.h | 6 ++++++ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 7a3bf7ffc50..3cc43f74879 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -106,12 +106,6 @@ LsaIFree_LSAPR_PRIVILEGE_SET(IN PLSAPR_PRIVILEGE_SET Ptr); typedef wchar_t *PSAMPR_SERVER_NAME; typedef void *SAMPR_HANDLE; -typedef struct _SAMPR_ULONG_ARRAY -{ - unsigned long Count; - unsigned long *Element; -} SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; - typedef struct _SAMPR_SID_INFORMATION { PRPC_SID SidPointer; diff --git a/dll/win32/lsasrv/lookup.c b/dll/win32/lsasrv/lookup.c index 19d3c56d3d0..b0805ebc0f8 100644 --- a/dll/win32/lsasrv/lookup.c +++ b/dll/win32/lsasrv/lookup.c @@ -22,13 +22,6 @@ typedef struct _SAMPR_RETURNED_USTRING_ARRAY PRPC_UNICODE_STRING Element; } SAMPR_RETURNED_USTRING_ARRAY, *PSAMPR_RETURNED_USTRING_ARRAY; -typedef struct _SAMPR_ULONG_ARRAY -{ - unsigned long Count; - unsigned long *Element; -} SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; - - VOID NTAPI SamIFree_SAMPR_RETURNED_USTRING_ARRAY(PSAMPR_RETURNED_USTRING_ARRAY Ptr); diff --git a/dll/win32/lsasrv/lsasrv.h b/dll/win32/lsasrv/lsasrv.h index 47c00d389ab..4bc0673c717 100644 --- a/dll/win32/lsasrv/lsasrv.h +++ b/dll/win32/lsasrv/lsasrv.h @@ -79,6 +79,12 @@ typedef struct _LSAP_LOGON_CONTEXT HANDLE ConnectionHandle; } LSAP_LOGON_CONTEXT, *PLSAP_LOGON_CONTEXT; +typedef struct _SAMPR_ULONG_ARRAY +{ + unsigned long Count; + unsigned long *Element; +} SAMPR_ULONG_ARRAY, *PSAMPR_ULONG_ARRAY; + extern SID_IDENTIFIER_AUTHORITY NullSidAuthority; extern SID_IDENTIFIER_AUTHORITY WorldSidAuthority; extern SID_IDENTIFIER_AUTHORITY LocalSidAuthority;