From 41776e1091d0b0bb71b94737a63db65a1fc53e8d Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 4 Nov 2008 19:46:43 +0100
Subject: s4-samr: merge samr_GetDisplayEnumerationIndex2 from s3 idl.

Guenther
---
 librpc/idl/samr.idl        | 4 ++--
 source4/torture/rpc/samr.c | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/librpc/idl/samr.idl b/librpc/idl/samr.idl
index 0673b67b0a..1c60d361de 100644
--- a/librpc/idl/samr.idl
+++ b/librpc/idl/samr.idl
@@ -1237,8 +1237,8 @@ import "misc.idl", "lsa.idl", "security.idl";
 	NTSTATUS samr_GetDisplayEnumerationIndex2(
 		[in,ref]    policy_handle *domain_handle,
 		[in]        uint16 level,
-		[in]        lsa_String name,
-		[out]       uint32 idx
+		[in,ref]    lsa_String *name,
+		[out,ref]   uint32 *idx
 		);
 
 
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index e9daa63f6c..c52d08ac62 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -3508,14 +3508,19 @@ static bool test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX *
 	bool ret = true;
 	uint16_t levels[] = {1, 2, 3, 4, 5};
 	uint16_t ok_lvl[] = {1, 1, 1, 0, 0};
+	struct lsa_String name;
+	uint32_t idx = 0;
 	int i;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		printf("Testing GetDisplayEnumerationIndex2 level %u\n", levels[i]);
 
+		init_lsa_String(&name, TEST_ACCOUNT_NAME);
+
 		r.in.domain_handle = handle;
 		r.in.level = levels[i];
-		init_lsa_String(&r.in.name, TEST_ACCOUNT_NAME);
+		r.in.name = &name;
+		r.out.idx = &idx;
 
 		status = dcerpc_samr_GetDisplayEnumerationIndex2(p, mem_ctx, &r);
 		if (ok_lvl[i] && 
@@ -3526,7 +3531,7 @@ static bool test_GetDisplayEnumerationIndex2(struct dcerpc_pipe *p, TALLOC_CTX *
 			ret = false;
 		}
 
-		init_lsa_String(&r.in.name, "zzzzzzzz");
+		init_lsa_String(&name, "zzzzzzzz");
 
 		status = dcerpc_samr_GetDisplayEnumerationIndex2(p, mem_ctx, &r);
 		if (ok_lvl[i] && !NT_STATUS_EQUAL(NT_STATUS_NO_MORE_ENTRIES, status)) {
-- 
cgit