s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[gd/samba-autobuild/.git] / source4 / torture / libnet / domain.c

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index daf9012e0c716d4483b3f8daeabd24ecfd07165e..c523eeeab4b1489760a13a802df3daa5f401cb17 100644 (file)
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -1,45 +1,45 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    Test suite for libnet calls.
 
    Copyright (C) Rafal Szczesniak 2005
-   
+
    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 "lib/events/events.h"
+#include "torture/rpc/torture_rpc.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "param/param.h"
 
-static bool test_domainopen(struct libnet_context *net_ctx, TALLOC_CTX *mem_ctx,
+static bool test_domainopen(struct torture_context *tctx,
+                           struct libnet_context *net_ctx, TALLOC_CTX *mem_ctx,
                            struct lsa_String *domname,
                            struct policy_handle *domain_handle)
 {
        NTSTATUS status;
        struct libnet_DomainOpen io;
-       
-       printf("opening domain\n");
-       
+
+       torture_comment(tctx, "opening domain\n");
+
        io.in.domain_name  = talloc_strdup(mem_ctx, domname->string);
        io.in.access_mask  = SEC_FLAG_MAXIMUM_ALLOWED;
 
        status = libnet_DomainOpen(net_ctx, mem_ctx, &io);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("Composite domain open failed - %s\n", nt_errstr(status));
+               torture_comment(tctx, "Composite domain open failed - %s\n", nt_errstr(status));
                return false;
        }
 
@@ -48,24 +48,24 @@ static bool test_domainopen(struct libnet_context *net_ctx, TALLOC_CTX *mem_ctx,
 }
 
 
-static bool test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_cleanup(struct torture_context *tctx,
+                        struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
                         struct policy_handle *domain_handle)
 {
-       NTSTATUS status;
        struct samr_Close r;
        struct policy_handle handle;
 
        r.in.handle   = domain_handle;
        r.out.handle  = &handle;
-       
-       printf("closing domain handle\n");
-       
-       status = dcerpc_samr_Close(p, mem_ctx, &r);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Close failed - %s\n", nt_errstr(status));
-               return false;
-       }
-       
+
+       torture_comment(tctx, "closing domain handle\n");
+
+       torture_assert_ntstatus_ok(tctx,
+               dcerpc_samr_Close_r(b, mem_ctx, &r),
+               "Close failed");
+       torture_assert_ntstatus_ok(tctx, r.out.result,
+               "Close failed");
+
        return true;
 }
 
@@ -74,7 +74,6 @@ bool torture_domainopen(struct torture_context *torture)
 {
        NTSTATUS status;
        struct libnet_context *net_ctx;
-       struct event_context *evt_ctx;
        TALLOC_CTX *mem_ctx;
        bool ret = true;
        struct policy_handle h;
@@ -82,28 +81,27 @@ bool torture_domainopen(struct torture_context *torture)
 
        mem_ctx = talloc_init("test_domain_open");
 
-       evt_ctx = event_context_find(torture);
-       net_ctx = libnet_context_init(evt_ctx);
+       net_ctx = libnet_context_init(torture->ev, torture->lp_ctx);
 
-       status = torture_rpc_connection(torture, 
+       status = torture_rpc_connection(torture,
                                        &net_ctx->samr.pipe,
                                        &ndr_table_samr);
-       
+
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       name.string = lp_workgroup(global_loadparm);
+       name.string = lpcfg_workgroup(torture->lp_ctx);
 
        /*
         * Testing synchronous version
         */
-       if (!test_domainopen(net_ctx, mem_ctx, &name, &h)) {
+       if (!test_domainopen(torture, net_ctx, mem_ctx, &name, &h)) {
                ret = false;
                goto done;
        }
 
-       if (!test_cleanup(net_ctx->samr.pipe, mem_ctx, &h)) {
+       if (!test_cleanup(torture, net_ctx->samr.pipe->binding_handle, mem_ctx, &h)) {
                ret = false;
                goto done;
        }