From: Kamen Mazdrashki <kamenim@samba.org>
Date: Fri, 28 May 2010 02:06:55 +0000 (+0300)
Subject: s4/test: change prototype for test_opendomain()
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=1118c7b0e4d311becfcc0d6e3c53405649526a2c;p=kamenim%2Fsamba.git

s4/test: change prototype for test_opendomain()

- name changed to test_domain_open to be more alike athore functions
  in utils.c file
- output parameters moved to the end param list definition just
  after mem_ctx so it is somehow more clear those params are OUT
---

diff --git a/source4/torture/libnet/groupinfo.c b/source4/torture/libnet/groupinfo.c
index affd1e5f96..01f2f9e692 100644
--- a/source4/torture/libnet/groupinfo.c
+++ b/source4/torture/libnet/groupinfo.c
@@ -99,7 +99,7 @@ bool torture_groupinfo(struct torture_context *torture)
 	/*
 	 * Testing synchronous version
 	 */
-	if (!test_opendomain(torture, b, mem_ctx, &h, &name, &sid)) {
+	if (!test_domain_open(torture, b, &name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
diff --git a/source4/torture/libnet/groupman.c b/source4/torture/libnet/groupman.c
index 7788ee85c3..f44793ac82 100644
--- a/source4/torture/libnet/groupman.c
+++ b/source4/torture/libnet/groupman.c
@@ -72,7 +72,7 @@ bool torture_groupadd(struct torture_context *torture)
 	b = p->binding_handle;
 
 	domain_name.string = lp_workgroup(torture->lp_ctx);
-	if (!test_opendomain(torture, b, mem_ctx, &h, &domain_name, &sid)) {
+	if (!test_domain_open(torture, b, &domain_name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index d6ea609a43..04a9240eef 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -138,7 +138,7 @@ bool torture_userinfo(struct torture_context *torture)
 	/*
 	 * Testing synchronous version
 	 */
-	if (!test_opendomain(torture, b, mem_ctx, &h, &name, &sid)) {
+	if (!test_domain_open(torture, b, &name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
@@ -161,7 +161,7 @@ bool torture_userinfo(struct torture_context *torture)
 	/*
 	 * Testing asynchronous version and monitor messages
 	 */
-	if (!test_opendomain(torture, b, mem_ctx, &h, &name, &sid)) {
+	if (!test_domain_open(torture, b, &name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index b1699cf4e7..98365d3bff 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -326,7 +326,7 @@ bool torture_useradd(struct torture_context *torture)
 	b = p->binding_handle;
 
 	domain_name.string = lp_workgroup(torture->lp_ctx);
-	if (!test_opendomain(torture, b, mem_ctx, &h, &domain_name, &sid)) {
+	if (!test_domain_open(torture, b, &domain_name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
@@ -341,7 +341,7 @@ bool torture_useradd(struct torture_context *torture)
 		goto done;
 	}
 
-	if (!test_opendomain(torture, b, mem_ctx, &h, &domain_name, &sid)) {
+	if (!test_domain_open(torture, b, &domain_name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
@@ -387,7 +387,7 @@ bool torture_userdel(struct torture_context *torture)
 	b = p->binding_handle;
 
 	domain_name.string = lp_workgroup(torture->lp_ctx);
-	if (!test_opendomain(torture, b, mem_ctx, &h, &domain_name, &sid)) {
+	if (!test_domain_open(torture, b, &domain_name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
@@ -434,7 +434,7 @@ bool torture_usermod(struct torture_context *torture)
 	domain_name.string = lp_workgroup(torture->lp_ctx);
 	name = talloc_strdup(mem_ctx, TEST_USERNAME);
 
-	if (!test_opendomain(torture, b, mem_ctx, &h, &domain_name, &sid)) {
+	if (!test_domain_open(torture, b, &domain_name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c
index 27dae51194..0bd8a7c0dc 100644
--- a/source4/torture/libnet/utils.c
+++ b/source4/torture/libnet/utils.c
@@ -35,11 +35,11 @@
  * @param _dom_sid [out] If NULL, Domain SID won't be returned
  * @return
  */
-bool test_opendomain(struct torture_context *tctx,
+bool test_domain_open(struct torture_context *tctx,
 		     struct dcerpc_binding_handle *b,
+		     struct lsa_String *domname,
 		     TALLOC_CTX *mem_ctx,
 		     struct policy_handle *_domain_handle,
-		     struct lsa_String *domname,
 		     struct dom_sid2 *_dom_sid)
 {
 	struct policy_handle connect_handle;
diff --git a/source4/torture/libnet/utils.h b/source4/torture/libnet/utils.h
index 04ea3e2feb..26350e3012 100644
--- a/source4/torture/libnet/utils.h
+++ b/source4/torture/libnet/utils.h
@@ -19,11 +19,12 @@
 */
 
 
-bool test_opendomain(struct torture_context *tctx,
+bool test_domain_open(struct torture_context *tctx,
 		     struct dcerpc_binding_handle *b,
+		     struct lsa_String *domname,
 		     TALLOC_CTX *mem_ctx,
-		     struct policy_handle *handle, struct lsa_String *domname,
-		     struct dom_sid2 *sid);
+		     struct policy_handle *_domain_handle,
+		     struct dom_sid2 *_dom_sid);
 
 bool test_user_create(struct torture_context *tctx,
 		      struct dcerpc_binding_handle *b,