s4/test: Remove duplicated test_opendomain() functionality

[kamenim/samba.git] / source4 / torture / libnet / libnet_group.c

diff --git a/source4/torture/libnet/libnet_group.c b/source4/torture/libnet/libnet_group.c
index d1148f0d23cd00580789ee10595daa7d44dd471a..20f47466aa7d0f942d091ca95ea05633867eed8b 100644 (file)
--- a/source4/torture/libnet/libnet_group.c
+++ b/source4/torture/libnet/libnet_group.c
@@ -24,7 +24,8 @@
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
+#include "torture/libnet/proto.h"
 #include "param/param.h"
 
 
@@ -138,78 +139,6 @@ static bool test_creategroup(struct torture_context *tctx,
 }
 
 
-static bool test_opendomain(struct torture_context *tctx,
-                           struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *handle, struct lsa_String *domname)
-{
-       struct policy_handle h, domain_handle;
-       struct samr_Connect r1;
-       struct samr_LookupDomain r2;
-       struct dom_sid2 *sid = NULL;
-       struct samr_OpenDomain r3;
-
-       torture_comment(tctx, "connecting\n");
-
-       r1.in.system_name = 0;
-       r1.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r1.out.connect_handle = &h;
-
-       torture_assert_ntstatus_ok(tctx,
-               dcerpc_samr_Connect_r(b, mem_ctx, &r1),
-               "Connect failed");
-       torture_assert_ntstatus_ok(tctx, r1.out.result,
-               "Connect failed");
-
-       r2.in.connect_handle = &h;
-       r2.in.domain_name = domname;
-       r2.out.sid = &sid;
-
-       torture_comment(tctx, "domain lookup on %s\n", domname->string);
-
-       torture_assert_ntstatus_ok(tctx,
-               dcerpc_samr_LookupDomain_r(b, mem_ctx, &r2),
-               "LookupDomain failed");
-       torture_assert_ntstatus_ok(tctx, r2.out.result,
-               "LookupDomain failed");
-
-       r3.in.connect_handle = &h;
-       r3.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
-       r3.in.sid = *r2.out.sid;
-       r3.out.domain_handle = &domain_handle;
-
-       torture_comment(tctx, "opening domain\n");
-
-       torture_assert_ntstatus_ok(tctx,
-               dcerpc_samr_OpenDomain_r(b, mem_ctx, &r3),
-               "OpenDomain failed");
-       torture_assert_ntstatus_ok(tctx, r3.out.result,
-               "OpenDomain failed");
-
-       *handle = domain_handle;
-
-       return true;
-}
-
-
-static bool test_samr_close(struct torture_context *tctx,
-                           struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
-                           struct policy_handle *domain_handle)
-{
-       struct samr_Close r;
-
-       r.in.handle = domain_handle;
-       r.out.handle = domain_handle;
-
-       torture_assert_ntstatus_ok(tctx,
-               dcerpc_samr_Close_r(b, mem_ctx, &r),
-               "Close samr domain failed");
-       torture_assert_ntstatus_ok(tctx, r.out.result,
-               "Close samr domain failed");
-
-       return true;
-}
-
-
 static bool test_lsa_close(struct torture_context *tctx,
                           struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
                           struct policy_handle *domain_handle)
@@ -254,7 +183,7 @@ bool torture_groupinfo_api(struct torture_context *torture)
        }
 
        domain_name.string = lp_workgroup(torture->lp_ctx);
-       if (!test_opendomain(torture, p->binding_handle, prep_mem_ctx, &h, &domain_name)) {
+       if (!test_domain_open(torture, p->binding_handle, &domain_name, prep_mem_ctx, &h, NULL)) {
                ret = false;
                goto done;
        }
@@ -285,7 +214,8 @@ bool torture_groupinfo_api(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_samr_close(torture, ctx->samr.pipe->binding_handle, mem_ctx, &ctx->samr.handle)) {
+       if (!test_samr_close_handle(torture,
+                                   ctx->samr.pipe->binding_handle, mem_ctx, &ctx->samr.handle)) {
                torture_comment(torture, "domain close failed\n");
                ret = false;
        }
@@ -341,7 +271,8 @@ bool torture_grouplist(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_samr_close(torture, ctx->samr.pipe->binding_handle, mem_ctx, &ctx->samr.handle)) {
+       if (!test_samr_close_handle(torture,
+                                   ctx->samr.pipe->binding_handle, mem_ctx, &ctx->samr.handle)) {
                torture_comment(torture, "domain close failed\n");
                ret = false;
        }
@@ -389,7 +320,8 @@ bool torture_creategroup(struct torture_context *torture)
                goto done;
        }
 
-       if (!test_samr_close(torture, ctx->samr.pipe->binding_handle, mem_ctx, &ctx->samr.handle)) {
+       if (!test_samr_close_handle(torture,
+                                   ctx->samr.pipe->binding_handle, mem_ctx, &ctx->samr.handle)) {
                torture_comment(torture, "domain close failed\n");
                ret = false;
        }