diff options
Diffstat (limited to 'source4/torture/libnet/libnet_user.c')
-rw-r--r-- | source4/torture/libnet/libnet_user.c | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c index 8fcf9818db..587676a767 100644 --- a/source4/torture/libnet/libnet_user.c +++ b/source4/torture/libnet/libnet_user.c @@ -157,25 +157,6 @@ static bool test_cleanup(struct torture_context *tctx, } -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) @@ -225,7 +206,8 @@ bool torture_createuser(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; } @@ -563,7 +545,8 @@ cleanup: goto done; } - if (!test_samr_close(torture, ctx->samr.pipe->binding_handle, torture, &ctx->samr.handle)) { + if (!test_samr_close_handle(torture, + ctx->samr.pipe->binding_handle, torture, &ctx->samr.handle)) { torture_comment(torture, "domain close failed\n"); ret = false; } @@ -633,7 +616,8 @@ bool torture_userinfo_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; } @@ -690,7 +674,8 @@ bool torture_userlist(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, "samr domain close failed\n"); ret = false; goto done; |