The branch, master has been updated
via fcad135... s4-smbtorture: add missing checks for WERROR results in
RPC-SAMBA3 tests.
via 8cd63a8... s4-smbtorture: fix some invalid parameters in
RPC-SAMSYNC test.
from 9fd24eb... s4-smbtorture: cleanup some of the RPC-SAMBA3 tests.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fcad13500bee1305784df6de0f553372b2948a74
Author: Günther Deschner <[email protected]>
Date: Wed Mar 24 13:34:01 2010 +0100
s4-smbtorture: add missing checks for WERROR results in RPC-SAMBA3 tests.
Guenther
commit 8cd63a854e465bba030436038e4644f694f2801a
Author: Günther Deschner <[email protected]>
Date: Wed Mar 24 13:18:33 2010 +0100
s4-smbtorture: fix some invalid parameters in RPC-SAMSYNC test.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/samba3rpc.c | 18 +++++++++++++++++-
source4/torture/rpc/samsync.c | 8 ++++----
2 files changed, 21 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 4de8f67..9ff59e7 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -2166,6 +2166,12 @@ static struct security_descriptor *get_sharesec(struct
torture_context *tctx,
talloc_free(tmp_ctx);
return NULL;
}
+ if (!W_ERROR_IS_OK(r.out.result)) {
+ torture_comment(tctx, "srvsvc_NetShareGetInfo failed: %s\n",
+ win_errstr(r.out.result));
+ talloc_free(tmp_ctx);
+ return NULL;
+ }
result = talloc_steal(mem_ctx, info.info502->sd_buf.sd);
talloc_free(tmp_ctx);
@@ -2227,7 +2233,11 @@ static NTSTATUS set_sharesec(struct torture_context
*tctx,
torture_comment(tctx, "srvsvc_NetShareSetInfo failed: %s\n",
nt_errstr(status));
}
-
+ if (!W_ERROR_IS_OK(r.out.result)) {
+ torture_comment(tctx, "srvsvc_NetShareSetInfo failed: %s\n",
+ win_errstr(r.out.result));
+ status = werror_to_ntstatus(r.out.result);
+ }
talloc_free(tmp_ctx);
return status;
}
@@ -2490,6 +2500,8 @@ static bool find_printers(struct torture_context *tctx,
torture_assert_ntstatus_ok(tctx,
dcerpc_srvsvc_NetShareEnum_r(b, tctx, &r),
"NetShareEnum level 1 failed");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "NetShareEnum level 1 failed");
*printers = NULL;
*num_printers = 0;
@@ -2766,6 +2778,8 @@ static bool torture_samba3_rpc_wkssvc(struct
torture_context *torture)
torture_assert_ntstatus_ok(torture,
dcerpc_wkssvc_NetWkstaGetInfo_r(b, torture, &r),
"dcerpc_wkssvc_NetWksGetInfo failed");
+ torture_assert_werr_ok(torture, r.out.result,
+ "dcerpc_wkssvc_NetWksGetInfo failed");
torture_assert_str_equal(torture, servername,
r.out.info->info100->server_name,
"servername RAP / DCERPC inconsistency");
@@ -2903,6 +2917,8 @@ static bool test_Open3(struct torture_context *tctx,
torture_assert_ntstatus_ok(tctx,
open_fn(b, tctx, &r),
talloc_asprintf(tctx, "%s failed", name));
+ torture_assert_werr_ok(tctx, r.out.result,
+ talloc_asprintf(tctx, "%s failed", name));
enumkeys(tctx, b, &handle, 4);
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index bf3dba5..0177ca8 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -494,7 +494,7 @@ static bool samsync_handle_user(struct torture_context
*tctx, TALLOC_CTX *mem_ct
ret = false;
}
- if (!test_samr_handle_Close(samsync_state->b_samr, mem_ctx,
&user_handle)) {
+ if (!test_samr_handle_Close(samsync_state->b_samr, tctx, &user_handle))
{
torture_comment(tctx, "samr_handle_Close failed - %s\n",
nt_errstr(nt_status));
ret = false;
@@ -763,7 +763,7 @@ static bool samsync_handle_alias(struct torture_context
*tctx,
TEST_SEC_DESC_EQUAL(alias->sdbuf, samr, &alias_handle);
nt_status = dcerpc_samr_QueryAliasInfo_r(samsync_state->b_samr,
mem_ctx, &q);
- if (!test_samr_handle_Close(samsync_state->b_samr, mem_ctx,
&alias_handle)) {
+ if (!test_samr_handle_Close(samsync_state->b_samr, tctx,
&alias_handle)) {
return false;
}
@@ -815,7 +815,7 @@ static bool samsync_handle_group(struct torture_context
*tctx,
TEST_SEC_DESC_EQUAL(group->sdbuf, samr, &group_handle);
nt_status = dcerpc_samr_QueryGroupInfo_r(samsync_state->b_samr,
mem_ctx, &q);
- if (!test_samr_handle_Close(samsync_state->b_samr, mem_ctx,
&group_handle)) {
+ if (!test_samr_handle_Close(samsync_state->b_samr, tctx,
&group_handle)) {
return false;
}
@@ -1586,7 +1586,7 @@ bool torture_rpc_samsync(struct torture_context *torture)
timestring(mem_ctx, time(NULL)));
status = dcerpc_samr_SetDomainInfo_r(samsync_state->b_samr, mem_ctx,
&s);
- if (!test_samr_handle_Close(samsync_state->b_samr, mem_ctx,
domain_policy)) {
+ if (!test_samr_handle_Close(samsync_state->b_samr, torture,
domain_policy)) {
ret = false;
goto failed;
}
--
Samba Shared Repository
