From: Günther Deschner <gd@samba.org>
Date: Wed, 27 Feb 2008 15:52:39 +0000 (+0100)
Subject: Move MAX_SAM_ENTRIES defines to samr rpc_server and to samr.idl.
X-Git-Tag: samba-3.2.0pre2~37^2~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c6455157317049d65a9012f4e339b7e86fb0af6;p=thirdparty%2Fsamba.git

Move MAX_SAM_ENTRIES defines to samr rpc_server and to samr.idl.

Guenther
---

diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 12fbfb601d7..9491212e3db 100644
--- a/source/include/rpc_samr.h
+++ b/source/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/source/librpc/idl/samr.idl b/source/librpc/idl/samr.idl
index ddef8b4d307..ac0934d85cd 100644
--- a/source/librpc/idl/samr.idl
+++ b/source/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/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index df7bb9b206c..8289440d6e9 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/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
  ********************************************************************/