From d61831dcd414e0279dfd576a8c85a83a37bf2699 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 27 Feb 2008 16:52:39 +0100 Subject: Move MAX_SAM_ENTRIES defines to samr rpc_server and to samr.idl. Guenther (This used to be commit 6c6455157317049d65a9012f4e339b7e86fb0af6) --- source3/include/rpc_samr.h | 5 ----- source3/librpc/idl/samr.idl | 4 ++++ source3/rpc_server/srv_samr_nt.c | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'source3') diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h index 12fbfb601d..9491212e3d 100644 --- a/source3/include/rpc_samr.h +++ b/source3/include/rpc_samr.h @@ -74,11 +74,6 @@ SamrTestPrivateFunctionsUser ********************************************************************/ -#define MAX_SAM_ENTRIES_W2K 0x400 -#define MAX_SAM_ENTRIES_W95 50 -/* The following should be the greater of the preceeding two. */ -#define MAX_SAM_ENTRIES MAX_SAM_ENTRIES_W2K - /* these are from the old rpc_samr.h - they are needed while the merge is still going on */ #define MAX_SAM_SIDS 15 diff --git a/source3/librpc/idl/samr.idl b/source3/librpc/idl/samr.idl index ddef8b4d30..ac0934d85c 100644 --- a/source3/librpc/idl/samr.idl +++ b/source3/librpc/idl/samr.idl @@ -316,6 +316,10 @@ import "misc.idl", "lsa.idl", "security.idl"; /************************/ /* Function 0x0b */ + + const int MAX_SAM_ENTRIES_W2K = 0x400; /* 1024 */ + const int MAX_SAM_ENTRIES_W95 = 50; + NTSTATUS samr_EnumDomainGroups( [in] policy_handle *domain_handle, [in,out,ref] uint32 *resume_handle, diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index df7bb9b206..8289440d6e 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -876,6 +876,8 @@ static NTSTATUS make_user_sam_entry_list(TALLOC_CTX *ctx, return NT_STATUS_OK; } +#define MAX_SAM_ENTRIES MAX_SAM_ENTRIES_W2K + /******************************************************************* _samr_EnumDomainUsers ********************************************************************/ -- cgit