sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4:torture/rpc: sync test_LogonControl2Ex with test_LogonControl2

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Stefan Metzmacher 2015-03-23 13:30:11 +01:00 committed by Günther Deschner
parent 30cb12e7d2
commit 1e782d9695
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/knownfail
View File

@ -90,6 +90,7 @@
^samba4.rpc.netlogon.*.DatabaseSync2
^samba4.rpc.netlogon.*.LogonControl\(.*\)$
^samba4.rpc.netlogon.*.LogonControl2\(.*\)$
^samba4.rpc.netlogon.*.LogonControl2Ex\(.*\)$
^samba4.rpc.netlogon.*.NetrEnumerateTrustedDomains
^samba4.rpc.netlogon.*.NetrEnumerateTrustedDomainsEx
^samba4.rpc.netlogon.*.GetPassword
@ -233,6 +234,7 @@
#
# The Samba4 netlogon server does not implement these LogonControl operations
#
^samba3.rpc.netlogon.admin.*.LogonControl2Ex\(ad_dc\)
^samba3.rpc.netlogon.admin.*.LogonControl2\(ad_dc\)
^samba3.rpc.netlogon.admin.*.LogonControl\(ad_dc\)
#

62
source4/torture/rpc/netlogon.c
View File

@ -2399,11 +2399,19 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
struct netr_LogonControl2Ex r;
union netr_CONTROL_DATA_INFORMATION data;
union netr_CONTROL_QUERY_INFORMATION query;
enum netr_SchannelType secure_channel_type = SEC_CHAN_NULL;
int i;
struct dcerpc_binding_handle *b = p->binding_handle;
data.domain = lpcfg_workgroup(tctx->lp_ctx);
if (machine_credentials) {
secure_channel_type = cli_credentials_get_secure_channel_type(machine_credentials);
}
torture_comment(tctx, "Testing LogonControl2Ex with secure channel type: %d\n",
secure_channel_type);
r.in.logon_server = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
r.in.function_code = NETLOGON_CONTROL_REDISCOVER;
@ -2413,11 +2421,11 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
for (i=1;i<4;i++) {
r.in.level = i;
torture_comment(tctx, "Testing LogonControl2Ex level %d function %d\n",
i, r.in.function_code);
torture_comment(tctx, "Testing LogonControl2Ex function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
status = dcerpc_netr_LogonControl2Ex_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl");
torture_assert_ntstatus_ok(tctx, status, "LogonControl2Ex");
}
data.domain = lpcfg_workgroup(tctx->lp_ctx);
@ -2428,11 +2436,11 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
for (i=1;i<4;i++) {
r.in.level = i;
torture_comment(tctx, "Testing LogonControl2Ex level %d function %d\n",
i, r.in.function_code);
torture_comment(tctx, "Testing LogonControl2Ex function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
status = dcerpc_netr_LogonControl2Ex_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl");
torture_assert_ntstatus_ok(tctx, status, "LogonControl2Ex");
}
data.domain = lpcfg_workgroup(tctx->lp_ctx);
@ -2443,11 +2451,11 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
for (i=1;i<4;i++) {
r.in.level = i;
torture_comment(tctx, "Testing LogonControl2Ex level %d function %d\n",
i, r.in.function_code);
torture_comment(tctx, "Testing LogonControl2Ex function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
status = dcerpc_netr_LogonControl2Ex_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl");
torture_assert_ntstatus_ok(tctx, status, "LogonControl2Ex");
}
data.debug_level = ~0;
@ -2458,13 +2466,43 @@ static bool test_LogonControl2Ex(struct torture_context *tctx,
for (i=1;i<4;i++) {
r.in.level = i;
torture_comment(tctx, "Testing LogonControl2Ex level %d function %d\n",
i, r.in.function_code);
torture_comment(tctx, "Testing LogonControl2Ex function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
status = dcerpc_netr_LogonControl2Ex_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl");
torture_assert_ntstatus_ok(tctx, status, "LogonControl2Ex");
}
ZERO_STRUCT(data);
r.in.function_code = 52;
r.in.data = &data;
torture_comment(tctx, "Testing LogonControl2Ex function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
status = dcerpc_netr_LogonControl2Ex_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl2Ex");
switch (secure_channel_type) {
case SEC_CHAN_NULL:
torture_assert_werr_equal(tctx, r.out.result, WERR_NOT_SUPPORTED, "LogonControl2Ex");
break;
default:
torture_assert_werr_equal(tctx, r.out.result, WERR_ACCESS_DENIED, "LogonControl2Ex");
break;
}
data.debug_level = ~0;
r.in.function_code = NETLOGON_CONTROL_SET_DBFLAG;
r.in.data = &data;
r.in.level = 52;
torture_comment(tctx, "Testing LogonControl2Ex function code %s (%d) level %d\n",
function_code_str(tctx, r.in.function_code), r.in.function_code, r.in.level);
status = dcerpc_netr_LogonControl2Ex_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "LogonControl2Ex");
torture_assert_werr_equal(tctx, r.out.result, WERR_UNKNOWN_LEVEL, "LogonControl2Ex");
return true;
}