1 files changed, 22 insertions, 19 deletions

diff --git a/source4/torture/libnet/groupinfo.c b/source4/torture/libnet/groupinfo.c
index 4ddb1cefbe..0858d291e0 100644
--- a/source4/torture/libnet/groupinfo.c
+++ b/source4/torture/libnet/groupinfo.c
@@ -1,35 +1,36 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Test suite for libnet calls.
 
    Copyright (C) Rafal Szczesniak 2007
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
 #include "libnet/libnet.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
-#include "torture/libnet/utils.h"
+#include "torture/libnet/proto.h"
 
 #define TEST_GROUPNAME  "libnetgroupinfotest"
 
 
-static bool test_groupinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_groupinfo(struct torture_context *tctx,
+			   struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			   struct policy_handle *domain_handle,
 			   struct dom_sid2 *domain_sid, const char* group_name,
 			   uint32_t *rid)
@@ -38,17 +39,17 @@ static bool test_groupinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct libnet_rpc_groupinfo group;
 	struct dom_sid *group_sid;
-	
+
 	group_sid = dom_sid_add_rid(mem_ctx, domain_sid, *rid);
-	
+
 	group.in.domain_handle = *domain_handle;
 	group.in.sid           = dom_sid_string(mem_ctx, group_sid);
 	group.in.level         = level;       /* this should be extended */
 
-	printf("Testing sync libnet_rpc_groupinfo (SID argument)\n");
+	torture_comment(tctx, "Testing sync libnet_rpc_groupinfo (SID argument)\n");
 	status = libnet_rpc_groupinfo(p, mem_ctx, &group);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Failed to call sync libnet_rpc_userinfo - %s\n", nt_errstr(status));
+		torture_comment(tctx, "Failed to call sync libnet_rpc_userinfo - %s\n", nt_errstr(status));
 		return false;
 	}
 
@@ -62,7 +63,7 @@ static bool test_groupinfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("Testing sync libnet_rpc_groupinfo (groupname argument)\n");
 	status = libnet_rpc_groupinfo(p, mem_ctx, &group);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Failed to call sync libnet_rpc_groupinfo - %s\n", nt_errstr(status));
+		torture_comment(tctx, "Failed to call sync libnet_rpc_groupinfo - %s\n", nt_errstr(status));
 		return false;
 	}
 
@@ -80,38 +81,40 @@ bool torture_groupinfo(struct torture_context *torture)
 	struct lsa_String name;
 	struct dom_sid2 sid;
 	uint32_t rid;
+	struct dcerpc_binding_handle *b;
 
 	mem_ctx = talloc_init("test_userinfo");
 
-	status = torture_rpc_connection(torture, 
+	status = torture_rpc_connection(torture,
 					&p,
 					&ndr_table_samr);
-	
+
 	if (!NT_STATUS_IS_OK(status)) {
 		return false;
 	}
+	b = p->binding_handle;
 
-	name.string = lp_workgroup(torture->lp_ctx);
+	name.string = lpcfg_workgroup(torture->lp_ctx);
 
 	/*
 	 * Testing synchronous version
 	 */
-	if (!test_opendomain(torture, p, mem_ctx, &h, &name, &sid)) {
+	if (!test_domain_open(torture, b, &name, mem_ctx, &h, &sid)) {
 		ret = false;
 		goto done;
 	}
 
-	if (!test_group_create(p, mem_ctx, &h, TEST_GROUPNAME, &rid)) {
+	if (!test_group_create(torture, b, mem_ctx, &h, TEST_GROUPNAME, &rid)) {
 		ret = false;
 		goto done;
 	}
 
-	if (!test_groupinfo(p, mem_ctx, &h, &sid, TEST_GROUPNAME, &rid)) {
+	if (!test_groupinfo(torture, p, mem_ctx, &h, &sid, TEST_GROUPNAME, &rid)) {
 		ret = false;
 		goto done;
 	}
 
-	if (!test_group_cleanup(p, mem_ctx, &h, TEST_GROUPNAME)) {
+	if (!test_group_cleanup(torture, b, mem_ctx, &h, TEST_GROUPNAME)) {
 		ret = false;
 		goto done;
 	}