s4-lsa: merge lsa_LookupSids/{2,3} from s3 lsa idl.

Guenther

2 files changed, 26 insertions, 11 deletions

diff --git a/source4/torture/ndr/lsa.c b/source4/torture/ndr/lsa.c
index 0d6d786882..6f580bd8d8 100644
--- a/source4/torture/ndr/lsa.c
+++ b/source4/torture/ndr/lsa.c
@@ -1014,11 +1014,12 @@ static const uint8_t lsarlookupsids_out_data[] = {
 static bool lsarlookupsids_out_check(struct torture_context *tctx, 
 									 struct lsa_LookupSids *r)
 {
-	torture_assert(tctx, r->out.domains != NULL, "domains");
-	torture_assert_int_equal(tctx, r->out.domains->count, 1, "domains count");
-	torture_assert_int_equal(tctx, r->out.domains->max_size, 32, "domains size");
-	torture_assert(tctx, r->out.domains->domains != NULL, "domains domains");
-	torture_assert_str_equal(tctx, r->out.domains->domains[0].name.string, "BUILTIN", "name");
+	struct lsa_RefDomainList *domains = *(r->out.domains);
+	torture_assert(tctx, domains != NULL, "domains");
+	torture_assert_int_equal(tctx, domains->count, 1, "domains count");
+	torture_assert_int_equal(tctx, domains->max_size, 32, "domains size");
+	torture_assert(tctx, domains->domains != NULL, "domains domains");
+	torture_assert_str_equal(tctx, domains->domains[0].name.string, "BUILTIN", "name");
 	torture_assert_ntstatus_ok(tctx, r->out.result, "return code");
 	return true;
 }
@@ -1474,12 +1475,13 @@ static const uint8_t lsarlookupsids2_out_data[] = {
 static bool lsarlookupsids2_out_check(struct torture_context *tctx, 
 									 struct lsa_LookupSids2 *r)
 {
+	struct lsa_RefDomainList *domains = *(r->out.domains);
 	/* FIXME: Handle */
 	torture_assert(tctx, r->out.names != NULL, "names ptr");
 	torture_assert(tctx, r->out.domains != NULL, "domains ptr");
-	torture_assert_int_equal(tctx, r->out.domains->count, 4, "domains count");
-	torture_assert_int_equal(tctx, r->out.domains->max_size, 32, "domains size");
-	torture_assert_str_equal(tctx, r->out.domains->domains[0].name.string, "NT AUTHORITY", "trust info name");
+	torture_assert_int_equal(tctx, domains->count, 4, "domains count");
+	torture_assert_int_equal(tctx, domains->max_size, 32, "domains size");
+	torture_assert_str_equal(tctx, domains->domains[0].name.string, "NT AUTHORITY", "trust info name");
 	torture_assert_int_equal(tctx, r->out.names->count, 7, "names count");
 	torture_assert_str_equal(tctx, r->out.names->names[0].name.string, "Account Operators", "name str 1");
 	torture_assert_str_equal(tctx, r->out.names->names[1].name.string, "Administrators", "name str 2");
@@ -1749,12 +1751,13 @@ static const uint8_t lsarlookupsids3_out_data[] = {
 static bool lsarlookupsids3_out_check(struct torture_context *tctx, 
 				      struct lsa_LookupSids3 *r)
 {
+	struct lsa_RefDomainList *domains = *(r->out.domains);
 	/* FIXME: Handle */
 	torture_assert(tctx, r->out.names != NULL, "names ptr");
 	torture_assert(tctx, r->out.domains != NULL, "domains ptr");
-	torture_assert_int_equal(tctx, r->out.domains->count, 4, "domains count");
-	torture_assert_int_equal(tctx, r->out.domains->max_size, 32, "domains size");
-	torture_assert_str_equal(tctx, r->out.domains->domains[0].name.string, "NT AUTHORITY", "trust info name");
+	torture_assert_int_equal(tctx, domains->count, 4, "domains count");
+	torture_assert_int_equal(tctx, domains->max_size, 32, "domains size");
+	torture_assert_str_equal(tctx, domains->domains[0].name.string, "NT AUTHORITY", "trust info name");
 	torture_assert_int_equal(tctx, r->out.names->count, 7, "names count");
 	torture_assert_str_equal(tctx, r->out.names->names[0].name.string, "Account Operators", "name str 1");
 	torture_assert_str_equal(tctx, r->out.names->names[1].name.string, "Administrators", "name str 2");
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index a5f7f73959..ea9435bd95 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -449,6 +449,7 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
 {
 	struct lsa_LookupSids r;
 	struct lsa_TransNameArray names;
+	struct lsa_RefDomainList *domains = NULL;
 	uint32_t count = sids->num_sids;
 	NTSTATUS status;
 
@@ -464,6 +465,7 @@ static bool test_LookupSids(struct dcerpc_pipe *p,
 	r.in.count = &count;
 	r.out.count = &count;
 	r.out.names = &names;
+	r.out.domains = &domains;
 
 	status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -488,6 +490,7 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
 {
 	struct lsa_LookupSids2 r;
 	struct lsa_TransNameArray2 names;
+	struct lsa_RefDomainList *domains = NULL;
 	uint32_t count = sids->num_sids;
 	NTSTATUS status;
 
@@ -505,6 +508,7 @@ static bool test_LookupSids2(struct dcerpc_pipe *p,
 	r.in.unknown2 = 0;
 	r.out.count = &count;
 	r.out.names = &names;
+	r.out.domains = &domains;
 
 	status = dcerpc_lsa_LookupSids2(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -531,6 +535,7 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
 {
 	struct lsa_LookupSids3 r;
 	struct lsa_TransNameArray2 names;
+	struct lsa_RefDomainList *domains = NULL;
 	uint32_t count = sids->num_sids;
 	NTSTATUS status;
 
@@ -545,6 +550,7 @@ static bool test_LookupSids3(struct dcerpc_pipe *p,
 	r.in.count = &count;
 	r.in.unknown1 = 0;
 	r.in.unknown2 = 0;
+	r.out.domains = &domains;
 	r.out.count = &count;
 	r.out.names = &names;
 
@@ -594,6 +600,7 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
 	if (handle) {
 		struct lsa_LookupSids r;
 		struct lsa_TransNameArray names;
+		struct lsa_RefDomainList *domains = NULL;
 		names.count = 0;
 		names.names = NULL;
 
@@ -604,6 +611,7 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
 		r.in.count = &names.count;
 		r.out.count = &count;
 		r.out.names = &names;
+		r.out.domains = &domains;
 		
 		status = dcerpc_lsa_LookupSids(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
@@ -619,6 +627,7 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
 	} else if (p->conn->security_state.auth_info->auth_type == DCERPC_AUTH_TYPE_SCHANNEL &&
 		   p->conn->security_state.auth_info->auth_level >= DCERPC_AUTH_LEVEL_INTEGRITY) {
 		struct lsa_LookupSids3 r;
+		struct lsa_RefDomainList *domains = NULL;
 		struct lsa_TransNameArray2 names;
 
 		names.count = 0;
@@ -634,6 +643,7 @@ bool test_many_LookupSids(struct dcerpc_pipe *p,
 		r.in.unknown2 = 0;
 		r.out.count = &count;
 		r.out.names = &names;
+		r.out.domains = &domains;
 		
 		status = dcerpc_lsa_LookupSids3(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
@@ -683,6 +693,7 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
 	uint32_t *count;
 	struct lsa_TransNameArray *names;
 	struct lsa_LookupSids *r;
+	struct lsa_RefDomainList *domains = NULL;
 	struct rpc_request **req;
 	int i, replies;
 	bool ret = true;
@@ -714,6 +725,7 @@ static bool test_LookupSids_async(struct dcerpc_pipe *p,
 		r[i].in.count = &names[i].count;
 		r[i].out.count = &count[i];
 		r[i].out.names = &names[i];
+		r[i].out.domains = &domains;
 		
 		req[i] = dcerpc_lsa_LookupSids_send(p, req, &r[i]);
 		if (req[i] == NULL) {