s4-smbtorture: remove trailing whitespace in libnet torture tests.

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

diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 7f8600d2dd2c60044486ad5fc618c3eeaa35af8d..7e8a2d0b3a5d754ca9c92b60fbc2d45338cd5604 100644 (file)
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -1,52 +1,53 @@
-/* 
+/*
    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 2 of the License, or
+   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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_samr.h"
-#include "libnet/composite.h"
+#include "torture/rpc/rpc.h"
+#include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_samr_c.h"
+#include "param/param.h"
 
-static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_domainopen(struct libnet_context *net_ctx, TALLOC_CTX *mem_ctx,
                            struct lsa_String *domname,
                            struct policy_handle *domain_handle)
 {
        NTSTATUS status;
-       struct libnet_rpc_domain_open io;
-       
+       struct libnet_DomainOpen io;
+
        printf("opening domain\n");
-       
+
        io.in.domain_name  = talloc_strdup(mem_ctx, domname->string);
        io.in.access_mask  = SEC_FLAG_MAXIMUM_ALLOWED;
 
-       status = libnet_rpc_domain_open(p, mem_ctx, &io);
+       status = libnet_DomainOpen(net_ctx, mem_ctx, &io);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Composite domain open failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
 
        *domain_handle = io.out.domain_handle;
-       return True;
+       return true;
 }
 
 
-static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+static bool test_cleanup(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
                         struct policy_handle *domain_handle)
 {
        NTSTATUS status;
@@ -55,52 +56,52 @@ static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
        r.in.handle   = domain_handle;
        r.out.handle  = &handle;
-       
+
        printf("closing domain handle\n");
-       
-       status = dcerpc_samr_Close(p, mem_ctx, &r);
+
+       status = dcerpc_samr_Close_r(b, mem_ctx, &r);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Close failed - %s\n", nt_errstr(status));
-               return False;
+               return false;
        }
-       
-       return True;
+
+       return true;
 }
 
 
-BOOL torture_domainopen(void)
+bool torture_domainopen(struct torture_context *torture)
 {
        NTSTATUS status;
-       const char *binding;
-       struct dcerpc_pipe *p;
+       struct libnet_context *net_ctx;
        TALLOC_CTX *mem_ctx;
-       BOOL ret = True;
+       bool ret = true;
        struct policy_handle h;
        struct lsa_String name;
 
        mem_ctx = talloc_init("test_domain_open");
-       binding = lp_parm_string(-1, "torture", "binding");
 
-       status = torture_rpc_connection(mem_ctx, 
-                                       &p,
-                                       &dcerpc_table_samr);
-       
+       net_ctx = libnet_context_init(torture->ev, torture->lp_ctx);
+
+       status = torture_rpc_connection(torture,
+                                       &net_ctx->samr.pipe,
+                                       &ndr_table_samr);
+
        if (!NT_STATUS_IS_OK(status)) {
-               return False;
+               return false;
        }
 
-       name.string = lp_workgroup();
+       name.string = lp_workgroup(torture->lp_ctx);
 
        /*
         * Testing synchronous version
         */
-       if (!test_domainopen(p, mem_ctx, &name, &h)) {
-               ret = False;
+       if (!test_domainopen(net_ctx, mem_ctx, &name, &h)) {
+               ret = false;
                goto done;
        }
 
-       if (!test_cleanup(p, mem_ctx, &h)) {
-               ret = False;
+       if (!test_cleanup(net_ctx->samr.pipe->binding_handle, mem_ctx, &h)) {
+               ret = false;
                goto done;
        }