sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4-smbtorture: use torture_context in libnet domain tests as well.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2010-03-23 16:30:05 +01:00
parent bebb17ad0e
commit 3e04bf4fbc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/torture/libnet/domain.c
View File

@ -24,21 +24,22 @@
#include "librpc/gen_ndr/ndr_samr_c.h" #include "librpc/gen_ndr/ndr_samr_c.h"
#include "param/param.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 lsa_String *domname,
struct policy_handle *domain_handle) struct policy_handle *domain_handle)
{ {
NTSTATUS status; NTSTATUS status;
struct libnet_DomainOpen io; 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.domain_name = talloc_strdup(mem_ctx, domname->string);
io.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; io.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
status = libnet_DomainOpen(net_ctx, mem_ctx, &io); status = libnet_DomainOpen(net_ctx, mem_ctx, &io);
if (!NT_STATUS_IS_OK(status)) { 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; return false;
} }
@ -47,7 +48,8 @@ static bool test_domainopen(struct libnet_context *net_ctx, TALLOC_CTX *mem_ctx,
} }
static bool test_cleanup(struct dcerpc_binding_handle *b, 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) struct policy_handle *domain_handle)
{ {
NTSTATUS status; NTSTATUS status;
@ -57,11 +59,11 @@ static bool test_cleanup(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx,
r.in.handle = domain_handle; r.in.handle = domain_handle;
r.out.handle = &handle; r.out.handle = &handle;
printf("closing domain handle\n"); torture_comment(tctx, "closing domain handle\n");
status = dcerpc_samr_Close_r(b, mem_ctx, &r); status = dcerpc_samr_Close_r(b, mem_ctx, &r);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
printf("Close failed - %s\n", nt_errstr(status)); torture_comment(tctx, "Close failed - %s\n", nt_errstr(status));
return false; return false;
} }
@ -95,12 +97,12 @@ bool torture_domainopen(struct torture_context *torture)
/* /*
* Testing synchronous version * Testing synchronous version
*/ */
if (!test_domainopen(net_ctx, mem_ctx, &name, &h)) { if (!test_domainopen(torture, net_ctx, mem_ctx, &name, &h)) {
ret = false; ret = false;
goto done; goto done;
} }
if (!test_cleanup(net_ctx->samr.pipe->binding_handle, mem_ctx, &h)) { if (!test_cleanup(torture, net_ctx->samr.pipe->binding_handle, mem_ctx, &h)) {
ret = false; ret = false;
goto done; goto done;
} }