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

Guenther
(This used to be commit 6c6455157317049d65a9012f4e339b7e86fb0af6)

diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 12fbfb601d7d3439b6286fd1949b895374a729d0..9491212e3db3bbfff065910a2c1a422b156be943 100644 (file)
--- 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 ddef8b4d3075f546724b1ecb6cd960a49ef4b299..ac0934d85cdbc3982b975e87471e95d8887bc055 100644 (file)
--- 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 df7bb9b206ca49d934ef6898a5ee95f6710482cd..8289440d6e98ab4f844284390bf9520126887996 100644 (file)
--- 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
  ********************************************************************/