diff options
author | Stefan Metzmacher <metze@samba.org> | 2007-08-19 21:23:03 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:15 -0500 |
commit | f14bd1a90ab47a418c0ec2492990a417a0bb3bf6 (patch) | |
tree | 1e7935150d318de798581dec7317d30d7ae7d337 /source4/torture/rpc | |
parent | 6f448ba6f9637e3e9e838bdd2b18edad4ed2f20f (diff) | |
download | samba-f14bd1a90ab47a418c0ec2492990a417a0bb3bf6.tar.gz samba-f14bd1a90ab47a418c0ec2492990a417a0bb3bf6.tar.bz2 samba-f14bd1a90ab47a418c0ec2492990a417a0bb3bf6.zip |
r24557: rename 'dcerpc_table_' -> 'ndr_table_'
metze
(This used to be commit 84651aee81aaabbebf52ffc3fbcbabb2eec6eed5)
Diffstat (limited to 'source4/torture/rpc')
37 files changed, 98 insertions, 98 deletions
diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c index c61954f268..140d52c746 100644 --- a/source4/torture/rpc/alter_context.c +++ b/source4/torture/rpc/alter_context.c @@ -40,7 +40,7 @@ BOOL torture_rpc_alter_context(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_alter_context"); printf("opening LSA connection\n"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; @@ -51,14 +51,14 @@ BOOL torture_rpc_alter_context(struct torture_context *torture) } printf("Opening secondary DSSETUP context\n"); - status = dcerpc_secondary_context(p, &p2, &dcerpc_table_dssetup); + status = dcerpc_secondary_context(p, &p2, &ndr_table_dssetup); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); printf("dcerpc_alter_context failed - %s\n", nt_errstr(status)); return False; } - tmptbl = dcerpc_table_dssetup; + tmptbl = ndr_table_dssetup; tmptbl.syntax_id.if_version += 100; printf("Opening bad secondary connection\n"); status = dcerpc_secondary_context(p, &p2, &tmptbl); diff --git a/source4/torture/rpc/async_bind.c b/source4/torture/rpc/async_bind.c index 585266219c..155f3f8244 100644 --- a/source4/torture/rpc/async_bind.c +++ b/source4/torture/rpc/async_bind.c @@ -76,7 +76,7 @@ BOOL torture_async_bind(struct torture_context *torture) /* send bind requests */ for (i = 0; i < torture_numasync; i++) { - table[i] = &dcerpc_table_lsarpc; + table[i] = &ndr_table_lsarpc; bind_req[i] = dcerpc_pipe_connect_send(mem_ctx, binding_string, table[i], creds, evt_ctx); } diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c index 4eae1f24c8..da541fa1d1 100644 --- a/source4/torture/rpc/atsvc.c +++ b/source4/torture/rpc/atsvc.c @@ -126,7 +126,7 @@ struct torture_suite *torture_rpc_atsvc(void) struct torture_tcase *tcase; tcase = torture_suite_add_rpc_iface_tcase(suite, "atsvc", - &dcerpc_table_atsvc); + &ndr_table_atsvc); torture_rpc_tcase_add_test(tcase, "JobEnum", test_JobEnum); torture_rpc_tcase_add_test(tcase, "JobAdd", test_JobAdd); diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c index b2077d01b3..6e3ee1c421 100644 --- a/source4/torture/rpc/bench.c +++ b/source4/torture/rpc/bench.c @@ -105,7 +105,7 @@ BOOL torture_bench_rpc(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_srvsvc); + &ndr_table_srvsvc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c index d43d277265..71d3489ca4 100644 --- a/source4/torture/rpc/bind.c +++ b/source4/torture/rpc/bind.c @@ -59,18 +59,18 @@ BOOL torture_multi_bind(struct torture_context *torture) return False; } - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; } - status = dcerpc_pipe_auth(mem_ctx, &p, binding, &dcerpc_table_lsarpc, cmdline_credentials); + status = dcerpc_pipe_auth(mem_ctx, &p, binding, &ndr_table_lsarpc, cmdline_credentials); if (NT_STATUS_IS_OK(status)) { printf("(incorrectly) allowed re-bind to uuid %s - %s\n", - GUID_string(mem_ctx, &dcerpc_table_lsarpc.syntax_id.uuid), nt_errstr(status)); + GUID_string(mem_ctx, &ndr_table_lsarpc.syntax_id.uuid), nt_errstr(status)); ret = False; } else { printf("\n"); diff --git a/source4/torture/rpc/dcom.c b/source4/torture/rpc/dcom.c index f26b3fa771..38092a8d37 100644 --- a/source4/torture/rpc/dcom.c +++ b/source4/torture/rpc/dcom.c @@ -32,7 +32,7 @@ BOOL torture_rpc_dcom(void) mem_ctx = talloc_init("torture_rpc_dcom"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_IOXIDResolver); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_IOXIDResolver); if (!NT_STATUS_IS_OK(status)) { ret = False; } diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index 0e06936672..249af3ebb1 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -483,7 +483,7 @@ struct torture_suite *torture_rpc_dfs(void) #if 0 struct torture_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite, - "dfs", &dcerpc_table_netdfs); + "dfs", &ndr_table_netdfs); torture_rpc_tcase_add_test(tcase, "GetManagerVersion", test_GetManagerVersion); diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 5b2e92cf36..5e4ac3321f 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -751,7 +751,7 @@ BOOL torture_rpc_drsuapi(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_drsuapi); + &ndr_table_drsuapi); if (!NT_STATUS_IS_OK(status)) { torture_leave_domain(priv.join); talloc_free(mem_ctx); @@ -811,7 +811,7 @@ BOOL torture_rpc_drsuapi_cracknames(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_drsuapi); + &ndr_table_drsuapi); if (!NT_STATUS_IS_OK(status)) { torture_leave_domain(priv.join); talloc_free(mem_ctx); diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c index 08cb958cab..4d90b242c4 100644 --- a/source4/torture/rpc/dssetup.c +++ b/source4/torture/rpc/dssetup.c @@ -65,7 +65,7 @@ BOOL torture_rpc_dssetup(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_dssetup"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_dssetup); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_dssetup); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 9546e5fd3d..6357fa9ee5 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -180,7 +180,7 @@ static BOOL _test_DsBind(struct DsSyncTest *ctx, struct cli_credentials *credent status = dcerpc_pipe_connect_b(ctx, &b->pipe, ctx->drsuapi_binding, - &dcerpc_table_drsuapi, + &ndr_table_drsuapi, credentials, event); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c index 3d6885c5e5..3608f82686 100644 --- a/source4/torture/rpc/echo.c +++ b/source4/torture/rpc/echo.c @@ -433,7 +433,7 @@ struct torture_suite *torture_rpc_echo(void) struct torture_tcase *tcase; tcase = torture_suite_add_rpc_iface_tcase(suite, "echo", - &dcerpc_table_rpcecho); + &ndr_table_rpcecho); torture_rpc_tcase_add_test(tcase, "addone", test_addone); torture_rpc_tcase_add_test(tcase, "sinkdata", test_sinkdata); diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 8e953efc2c..ca4520e856 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -263,7 +263,7 @@ static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) struct epm_InqObject r; r.in.epm_object = talloc(mem_ctx, struct GUID); - *r.in.epm_object = dcerpc_table_epmapper.syntax_id.uuid; + *r.in.epm_object = ndr_table_epmapper.syntax_id.uuid; status = dcerpc_epm_InqObject(p, mem_ctx, &r); if (NT_STATUS_IS_ERR(status)) { @@ -283,7 +283,7 @@ BOOL torture_rpc_epmapper(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_epmapper"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_epmapper); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_epmapper); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c index 7961ec56ce..0c4ee14f85 100644 --- a/source4/torture/rpc/eventlog.c +++ b/source4/torture/rpc/eventlog.c @@ -240,7 +240,7 @@ struct torture_suite *torture_rpc_eventlog(void) suite = torture_suite_create(talloc_autofree_context(), "EVENTLOG"); tcase = torture_suite_add_rpc_iface_tcase(suite, "eventlog", - &dcerpc_table_eventlog); + &ndr_table_eventlog); torture_rpc_tcase_add_test(tcase, "OpenEventLog", test_OpenEventLog); torture_rpc_tcase_add_test(tcase, "ClearEventLog", test_ClearEventLog); diff --git a/source4/torture/rpc/handles.c b/source4/torture/rpc/handles.c index e72cd592d4..b20d25d1ef 100644 --- a/source4/torture/rpc/handles.c +++ b/source4/torture/rpc/handles.c @@ -45,10 +45,10 @@ static bool test_handles_lsa(struct torture_context *torture) torture_comment(torture, "RPC-HANDLE-LSARPC\n"); - status = torture_rpc_connection(mem_ctx, &p1, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p1, &ndr_table_lsarpc); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe1"); - status = torture_rpc_connection(mem_ctx, &p2, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p2, &ndr_table_lsarpc); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe1"); qos.len = 0; @@ -122,7 +122,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture) } torture_comment(torture, "connect lsa pipe1\n"); - status = torture_rpc_connection(mem_ctx, &p1, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p1, &ndr_table_lsarpc); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe1"); transport = p1->conn->transport.transport, @@ -131,7 +131,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture) torture_comment(torture, "use assoc_group_id[0x%08X] for new connections\n", assoc_group_id); torture_comment(torture, "connect lsa pipe2\n"); - status = torture_rpc_connection_transport(mem_ctx, &p2, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p2, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe2"); @@ -165,7 +165,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture) * connect p3 after the policy handle is opened */ torture_comment(torture, "connect lsa pipe3 after the policy handle is opened\n"); - status = torture_rpc_connection_transport(mem_ctx, &p3, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p3, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe3"); @@ -301,7 +301,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture) * and use the handle on it */ torture_comment(torture, "connect lsa pipe4 and use policy handle\n"); - status = torture_rpc_connection_transport(mem_ctx, &p4, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p4, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe4"); @@ -324,7 +324,7 @@ static bool test_handles_lsa_shared(struct torture_context *torture) * now open p5 */ torture_comment(torture, "connect lsa pipe5 - should fail\n"); - status = torture_rpc_connection_transport(mem_ctx, &p5, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p5, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, @@ -348,10 +348,10 @@ static bool test_handles_samr(struct torture_context *torture) torture_comment(torture, "RPC-HANDLE-SAMR\n"); - status = torture_rpc_connection(mem_ctx, &p1, &dcerpc_table_samr); + status = torture_rpc_connection(mem_ctx, &p1, &ndr_table_samr); torture_assert_ntstatus_ok(torture, status, "opening samr pipe1"); - status = torture_rpc_connection(mem_ctx, &p2, &dcerpc_table_samr); + status = torture_rpc_connection(mem_ctx, &p2, &ndr_table_samr); torture_assert_ntstatus_ok(torture, status, "opening samr pipe1"); r.in.system_name = 0; @@ -405,7 +405,7 @@ static bool test_handles_mixed_shared(struct torture_context *torture) } torture_comment(torture, "connect samr pipe1\n"); - status = torture_rpc_connection(mem_ctx, &p1, &dcerpc_table_samr); + status = torture_rpc_connection(mem_ctx, &p1, &ndr_table_samr); torture_assert_ntstatus_ok(torture, status, "opening samr pipe1"); transport = p1->conn->transport.transport, @@ -414,7 +414,7 @@ static bool test_handles_mixed_shared(struct torture_context *torture) torture_comment(torture, "use assoc_group_id[0x%08X] for new connections\n", assoc_group_id); torture_comment(torture, "connect lsa pipe2\n"); - status = torture_rpc_connection_transport(mem_ctx, &p2, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p2, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_ok(torture, status, "opening lsa pipe2"); @@ -448,28 +448,28 @@ static bool test_handles_mixed_shared(struct torture_context *torture) msleep(10); torture_comment(torture, "connect samr pipe3 - should fail\n"); - status = torture_rpc_connection_transport(mem_ctx, &p3, &dcerpc_table_samr, + status = torture_rpc_connection_transport(mem_ctx, &p3, &ndr_table_samr, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, "opening samr pipe3"); torture_comment(torture, "connect lsa pipe4 - should fail\n"); - status = torture_rpc_connection_transport(mem_ctx, &p4, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p4, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, "opening lsa pipe4"); torture_comment(torture, "connect samr pipe5 with assoc_group_id[0x%08X]- should fail\n", ++assoc_group_id); - status = torture_rpc_connection_transport(mem_ctx, &p5, &dcerpc_table_samr, + status = torture_rpc_connection_transport(mem_ctx, &p5, &ndr_table_samr, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, "opening samr pipe5"); torture_comment(torture, "connect lsa pipe6 with assoc_group_id[0x%08X]- should fail\n", ++assoc_group_id); - status = torture_rpc_connection_transport(mem_ctx, &p6, &dcerpc_table_lsarpc, + status = torture_rpc_connection_transport(mem_ctx, &p6, &ndr_table_lsarpc, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, @@ -491,7 +491,7 @@ static bool test_handles_random_assoc(struct torture_context *torture) torture_comment(torture, "RPC-HANDLE-RANDOM-ASSOC\n"); torture_comment(torture, "connect samr pipe1\n"); - status = torture_rpc_connection(mem_ctx, &p1, &dcerpc_table_samr); + status = torture_rpc_connection(mem_ctx, &p1, &ndr_table_samr); torture_assert_ntstatus_ok(torture, status, "opening samr pipe1"); transport = p1->conn->transport.transport, @@ -500,14 +500,14 @@ static bool test_handles_random_assoc(struct torture_context *torture) torture_comment(torture, "pip1 use assoc_group_id[0x%08X]\n", assoc_group_id); torture_comment(torture, "connect samr pipe2 with assoc_group_id[0x%08X]- should fail\n", ++assoc_group_id); - status = torture_rpc_connection_transport(mem_ctx, &p2, &dcerpc_table_samr, + status = torture_rpc_connection_transport(mem_ctx, &p2, &ndr_table_samr, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, "opening samr pipe2"); torture_comment(torture, "connect samr pipe3 with assoc_group_id[0x%08X]- should fail\n", ++assoc_group_id); - status = torture_rpc_connection_transport(mem_ctx, &p3, &dcerpc_table_samr, + status = torture_rpc_connection_transport(mem_ctx, &p3, &ndr_table_samr, transport, assoc_group_id); torture_assert_ntstatus_equal(torture, status, NT_STATUS_UNSUCCESSFUL, @@ -532,10 +532,10 @@ static bool test_handles_drsuapi(struct torture_context *torture) torture_comment(torture, "RPC-HANDLE-DRSUAPI\n"); - status = torture_rpc_connection(mem_ctx, &p1, &dcerpc_table_drsuapi); + status = torture_rpc_connection(mem_ctx, &p1, &ndr_table_drsuapi); torture_assert_ntstatus_ok(torture, status, "opening drsuapi pipe1"); - status = torture_rpc_connection(mem_ctx, &p2, &dcerpc_table_drsuapi); + status = torture_rpc_connection(mem_ctx, &p2, &ndr_table_drsuapi); torture_assert_ntstatus_ok(torture, status, "opening drsuapi pipe1"); GUID_from_string(DRSUAPI_DS_BIND_GUID, &bind_guid); diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c index 56bf74de51..84c96211b3 100644 --- a/source4/torture/rpc/initshutdown.c +++ b/source4/torture/rpc/initshutdown.c @@ -121,7 +121,7 @@ BOOL torture_rpc_initshutdown(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_initshutdown"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_initshutdown); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_initshutdown); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 44c0274c96..cf50d99d82 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -1999,7 +1999,7 @@ BOOL torture_rpc_lsa(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_lsa"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; @@ -2087,7 +2087,7 @@ BOOL torture_rpc_lsa_get_user(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_lsa_get_user"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c index 97a2800915..c2eb7e86c5 100644 --- a/source4/torture/rpc/lsa_lookup.c +++ b/source4/torture/rpc/lsa_lookup.c @@ -230,7 +230,7 @@ BOOL torture_rpc_lsa_lookup(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_lsa"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_lsarpc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { ret = False; goto done; diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c index 62150de33b..475e933bd2 100644 --- a/source4/torture/rpc/mgmt.c +++ b/source4/torture/rpc/mgmt.c @@ -233,7 +233,7 @@ BOOL torture_rpc_mgmt(struct torture_context *torture) lp_set_cmdline("torture:binding", dcerpc_binding_string(loop_ctx, b)); - status = torture_rpc_connection(loop_ctx, &p, &dcerpc_table_mgmt); + status = torture_rpc_connection(loop_ctx, &p, &ndr_table_mgmt); if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) { printf("Interface not available - skipping\n"); talloc_free(loop_ctx); diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index c63a6ee39a..fe27d93757 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -1563,7 +1563,7 @@ static BOOL test_ManyGetDCName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) return False; } - status = dcerpc_bind_auth_none(p2, &dcerpc_table_lsarpc); + status = dcerpc_bind_auth_none(p2, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { printf("Failed to create bind on secondary connection\n"); return False; @@ -1652,7 +1652,7 @@ BOOL torture_rpc_netlogon(struct torture_context *torture) machine_password = cli_credentials_get_password(machine_credentials); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_netlogon); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_netlogon); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c index 9b6e59ffe6..b849681cc2 100644 --- a/source4/torture/rpc/oxidresolve.c +++ b/source4/torture/rpc/oxidresolve.c @@ -231,7 +231,7 @@ BOOL torture_rpc_oxidresolve(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &premact, - &dcerpc_table_IRemoteActivation); + &ndr_table_IRemoteActivation); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); @@ -240,7 +240,7 @@ BOOL torture_rpc_oxidresolve(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_IOXIDResolver); + &ndr_table_IOXIDResolver); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c index d1b0e062c8..ce3ebd3749 100644 --- a/source4/torture/rpc/remact.c +++ b/source4/torture/rpc/remact.c @@ -107,7 +107,7 @@ BOOL torture_rpc_remact(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_IRemoteActivation); + &ndr_table_IRemoteActivation); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/rot.c b/source4/torture/rpc/rot.c index dfa054a4c4..5850e9b532 100644 --- a/source4/torture/rpc/rot.c +++ b/source4/torture/rpc/rot.c @@ -34,7 +34,7 @@ BOOL torture_rpc_rot(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_rot); + &ndr_table_rot); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index dfb2e535aa..92baca7ee0 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -161,7 +161,7 @@ NTSTATUS torture_rpc_init(void) dcerpc_init(); - dcerpc_table_init(); + ndr_table_init(); torture_suite_add_simple_test(suite, "LSA", torture_rpc_lsa); torture_suite_add_simple_test(suite, "LSALOOKUP", torture_rpc_lsa_lookup); diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index f904d43ee4..44813c7d2f 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -113,7 +113,7 @@ BOOL torture_bind_authcontext(struct torture_context *torture) goto done; } - status = dcerpc_bind_auth_none(lsa_pipe, &dcerpc_table_lsarpc); + status = dcerpc_bind_auth_none(lsa_pipe, &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { d_printf("dcerpc_bind_auth_none failed: %s\n", nt_errstr(status)); @@ -229,7 +229,7 @@ static BOOL bindtest(struct smbcli_state *cli, goto done; } - status = dcerpc_bind_auth(lsa_pipe, &dcerpc_table_lsarpc, + status = dcerpc_bind_auth(lsa_pipe, &ndr_table_lsarpc, credentials, auth_type, auth_level, NULL); if (!NT_STATUS_IS_OK(status)) { @@ -369,7 +369,7 @@ static NTSTATUS get_usr_handle(struct smbcli_state *cli, } if (admin_creds != NULL) { - status = dcerpc_bind_auth(samr_pipe, &dcerpc_table_samr, + status = dcerpc_bind_auth(samr_pipe, &ndr_table_samr, admin_creds, auth_type, auth_level, NULL); if (!NT_STATUS_IS_OK(status)) { @@ -379,7 +379,7 @@ static NTSTATUS get_usr_handle(struct smbcli_state *cli, } } else { /* We must have an authenticated SMB connection */ - status = dcerpc_bind_auth_none(samr_pipe, &dcerpc_table_samr); + status = dcerpc_bind_auth_none(samr_pipe, &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { d_printf("dcerpc_bind_auth_none failed: %s\n", nt_errstr(status)); @@ -834,7 +834,7 @@ static BOOL auth2(struct smbcli_state *cli, goto done; } - status = dcerpc_bind_auth_none(net_pipe, &dcerpc_table_netlogon); + status = dcerpc_bind_auth_none(net_pipe, &ndr_table_netlogon); if (!NT_STATUS_IS_OK(status)) { d_printf("dcerpc_bind_auth_none failed: %s\n", nt_errstr(status)); @@ -941,12 +941,12 @@ static BOOL schan(struct smbcli_state *cli, #endif #if 1 net_pipe->conn->flags |= (DCERPC_SIGN | DCERPC_SEAL); - status = dcerpc_bind_auth(net_pipe, &dcerpc_table_netlogon, + status = dcerpc_bind_auth(net_pipe, &ndr_table_netlogon, wks_creds, DCERPC_AUTH_TYPE_SCHANNEL, DCERPC_AUTH_LEVEL_PRIVACY, NULL); #else - status = dcerpc_bind_auth_none(net_pipe, &dcerpc_table_netlogon); + status = dcerpc_bind_auth_none(net_pipe, &ndr_table_netlogon); #endif if (!NT_STATUS_IS_OK(status)) { d_printf("schannel bind failed: %s\n", nt_errstr(status)); @@ -1500,7 +1500,7 @@ static struct dom_sid *whoami(TALLOC_CTX *mem_ctx, struct smbcli_tree *tree) struct dom_sid *result; status = pipe_bind_smb(mem_ctx, tree, "\\pipe\\lsarpc", - &dcerpc_table_lsarpc, &lsa); + &ndr_table_lsarpc, &lsa); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) Could not bind to LSA: %s\n", __location__, nt_errstr(status)); @@ -1838,7 +1838,7 @@ BOOL torture_samba3_rpc_srvsvc(struct torture_context *torture) } status = pipe_bind_smb(mem_ctx, cli->tree, "\\pipe\\srvsvc", - &dcerpc_table_srvsvc, &p); + &ndr_table_srvsvc, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) could not bind to srvsvc pipe: %s\n", __location__, nt_errstr(status)); @@ -1881,7 +1881,7 @@ static struct security_descriptor *get_sharesec(TALLOC_CTX *mem_ctx, } status = pipe_bind_smb(mem_ctx, tree, "\\pipe\\srvsvc", - &dcerpc_table_srvsvc, &p); + &ndr_table_srvsvc, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) could not bind to srvsvc pipe: %s\n", __location__, nt_errstr(status)); @@ -1936,7 +1936,7 @@ static NTSTATUS set_sharesec(TALLOC_CTX *mem_ctx, } status = pipe_bind_smb(mem_ctx, tree, "\\pipe\\srvsvc", - &dcerpc_table_srvsvc, &p); + &ndr_table_srvsvc, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) could not bind to srvsvc pipe: %s\n", __location__, nt_errstr(status)); @@ -2126,7 +2126,7 @@ BOOL torture_samba3_rpc_lsa(struct torture_context *torture) } status = pipe_bind_smb(mem_ctx, cli->tree, "\\lsarpc", - &dcerpc_table_lsarpc, &p); + &ndr_table_lsarpc, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) pipe_bind_smb failed: %s\n", __location__, nt_errstr(status)); @@ -2223,7 +2223,7 @@ static NTSTATUS find_printers(TALLOC_CTX *ctx, struct smbcli_tree *tree, return NT_STATUS_NO_MEMORY; } - status = pipe_bind_smb(mem_ctx, tree, "\\srvsvc", &dcerpc_table_srvsvc, + status = pipe_bind_smb(mem_ctx, tree, "\\srvsvc", &ndr_table_srvsvc, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("could not bind to srvsvc pipe\n"); @@ -2424,7 +2424,7 @@ BOOL torture_samba3_rpc_spoolss(struct torture_context *torture) } status = pipe_bind_smb(mem_ctx, cli->tree, "\\spoolss", - &dcerpc_table_spoolss, &p); + &ndr_table_spoolss, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) pipe_bind_smb failed: %s\n", __location__, nt_errstr(status)); @@ -2598,7 +2598,7 @@ BOOL torture_samba3_rpc_wkssvc(struct torture_context *torture) } status = pipe_bind_smb(mem_ctx, cli->tree, "\\wkssvc", - &dcerpc_table_wkssvc, &p); + &ndr_table_wkssvc, &p); if (!NT_STATUS_IS_OK(status)) { d_printf("(%s) pipe_bind_smb failed: %s\n", __location__, nt_errstr(status)); @@ -2824,7 +2824,7 @@ BOOL torture_samba3_rpc_winreg(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_winreg"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_winreg); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_winreg); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index 2baeda5a75..b01c911979 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -1594,7 +1594,7 @@ BOOL torture_rpc_samlogon(struct torture_context *torture) b->flags |= DCERPC_SCHANNEL | DCERPC_SIGN | DCERPC_SCHANNEL_128; status = dcerpc_pipe_connect_b(mem_ctx, &p, b, - &dcerpc_table_netlogon, + &ndr_table_netlogon, machine_credentials, NULL); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 8545df76ea..8e765fe027 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -4364,7 +4364,7 @@ BOOL torture_rpc_samr(struct torture_context *torture) BOOL ret = True; struct policy_handle handle; - status = torture_rpc_connection(torture, &p, &dcerpc_table_samr); + status = torture_rpc_connection(torture, &p, &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; } @@ -4392,7 +4392,7 @@ BOOL torture_rpc_samr_users(struct torture_context *torture) BOOL ret = True; struct policy_handle handle; - status = torture_rpc_connection(torture, &p, &dcerpc_table_samr); + status = torture_rpc_connection(torture, &p, &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; } @@ -4420,7 +4420,7 @@ BOOL torture_rpc_samr_passwords(struct torture_context *torture) BOOL ret = True; struct policy_handle handle; - status = torture_rpc_connection(torture, &p, &dcerpc_table_samr); + status = torture_rpc_connection(torture, &p, &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; } diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 3013d93977..cf08e857de 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -1505,7 +1505,7 @@ BOOL torture_rpc_samsync(struct torture_context *torture) status = torture_rpc_connection(samsync_state, &samsync_state->p_lsa, - &dcerpc_table_lsarpc); + &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { ret = False; @@ -1557,7 +1557,7 @@ BOOL torture_rpc_samsync(struct torture_context *torture) status = dcerpc_pipe_connect_b(samsync_state, &samsync_state->p, b, - &dcerpc_table_netlogon, + &ndr_table_netlogon, credentials, NULL); if (!NT_STATUS_IS_OK(status)) { @@ -1596,7 +1596,7 @@ BOOL torture_rpc_samsync(struct torture_context *torture) status = dcerpc_pipe_connect_b(samsync_state, &samsync_state->p_netlogon_wksta, b_netlogon_wksta, - &dcerpc_table_netlogon, + &ndr_table_netlogon, credentials_wksta, NULL); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c index 6dee60d599..b60d325c7c 100644 --- a/source4/torture/rpc/scanner.c +++ b/source4/torture/rpc/scanner.c @@ -142,7 +142,7 @@ BOOL torture_rpc_scanner(struct torture_context *torture) lp_set_cmdline("torture:binding", dcerpc_binding_string(mem_ctx, b)); - status = torture_rpc_connection(loop_ctx, &p, &dcerpc_table_mgmt); + status = torture_rpc_connection(loop_ctx, &p, &ndr_table_mgmt); if (!NT_STATUS_IS_OK(status)) { talloc_free(loop_ctx); ret = False; diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index 582eefa462..416a469fc4 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -269,7 +269,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, b->flags &= ~DCERPC_AUTH_OPTIONS; b->flags |= dcerpc_flags; - status = dcerpc_pipe_connect_b(test_ctx, &p, b, &dcerpc_table_samr, + status = dcerpc_pipe_connect_b(test_ctx, &p, b, &ndr_table_samr, credentials, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with schannel: %s\n", nt_errstr(status)); @@ -286,7 +286,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, * the second */ /* Swap the binding details from SAMR to NETLOGON */ - status = dcerpc_epm_map_binding(test_ctx, b, &dcerpc_table_netlogon, NULL); + status = dcerpc_epm_map_binding(test_ctx, b, &ndr_table_netlogon, NULL); if (!NT_STATUS_IS_OK(status)) { goto failed; } @@ -298,7 +298,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, goto failed; } - status = dcerpc_bind_auth(p_netlogon, &dcerpc_table_netlogon, + status = dcerpc_bind_auth(p_netlogon, &ndr_table_netlogon, credentials, DCERPC_AUTH_TYPE_SCHANNEL, dcerpc_auth_level(p->conn), NULL); @@ -324,7 +324,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, } /* Swap the binding details from SAMR to LSARPC */ - status = dcerpc_epm_map_binding(test_ctx, b, &dcerpc_table_lsarpc, NULL); + status = dcerpc_epm_map_binding(test_ctx, b, &ndr_table_lsarpc, NULL); if (!NT_STATUS_IS_OK(status)) { goto failed; } @@ -336,7 +336,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, goto failed; } - status = dcerpc_bind_auth(p_lsa, &dcerpc_table_lsarpc, + status = dcerpc_bind_auth(p_lsa, &ndr_table_lsarpc, credentials, DCERPC_AUTH_TYPE_SCHANNEL, dcerpc_auth_level(p->conn), NULL); @@ -365,7 +365,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, b->flags &= ~DCERPC_AUTH_OPTIONS; b->flags |= dcerpc_flags; - status = dcerpc_pipe_connect_b(test_ctx, &p_samr2, b, &dcerpc_table_samr, + status = dcerpc_pipe_connect_b(test_ctx, &p_samr2, b, &ndr_table_samr, credentials, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with schannel: %s\n", nt_errstr(status)); @@ -379,7 +379,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, } /* Swap the binding details from SAMR to NETLOGON */ - status = dcerpc_epm_map_binding(test_ctx, b, &dcerpc_table_netlogon, NULL); + status = dcerpc_epm_map_binding(test_ctx, b, &ndr_table_netlogon, NULL); if (!NT_STATUS_IS_OK(status)) { goto failed; } @@ -391,7 +391,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, } /* and now setup an SCHANNEL bind on netlogon */ - status = dcerpc_bind_auth(p_netlogon2, &dcerpc_table_netlogon, + status = dcerpc_bind_auth(p_netlogon2, &ndr_table_netlogon, credentials, DCERPC_AUTH_TYPE_SCHANNEL, dcerpc_auth_level(p_samr2->conn), NULL); @@ -419,7 +419,7 @@ static BOOL test_schannel(TALLOC_CTX *mem_ctx, /* We don't want schannel for this test */ b->flags &= ~DCERPC_AUTH_OPTIONS; - status = dcerpc_pipe_connect_b(test_ctx, &p_netlogon3, b, &dcerpc_table_netlogon, + status = dcerpc_pipe_connect_b(test_ctx, &p_netlogon3, b, &ndr_table_netlogon, credentials, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect without schannel: %s\n", nt_errstr(status)); @@ -527,7 +527,7 @@ BOOL torture_rpc_schannel2(struct torture_context *torture) b->flags |= dcerpc_flags; printf("Opening first connection\n"); - status = dcerpc_pipe_connect_b(test_ctx, &p1, b, &dcerpc_table_netlogon, + status = dcerpc_pipe_connect_b(test_ctx, &p1, b, &ndr_table_netlogon, credentials1, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with schannel: %s\n", nt_errstr(status)); @@ -535,7 +535,7 @@ BOOL torture_rpc_schannel2(struct torture_context *torture) } printf("Opening second connection\n"); - status = dcerpc_pipe_connect_b(test_ctx, &p2, b, &dcerpc_table_netlogon, + status = dcerpc_pipe_connect_b(test_ctx, &p2, b, &ndr_table_netlogon, credentials2, NULL); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with schannel: %s\n", nt_errstr(status)); diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c index d5026741fc..a438fea321 100644 --- a/source4/torture/rpc/session_key.c +++ b/source4/torture/rpc/session_key.c @@ -172,7 +172,7 @@ BOOL torture_rpc_lsa_secrets(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_lsarpc); + &ndr_table_lsarpc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index bfedfc9d5c..2b07b326aa 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -1650,7 +1650,7 @@ static BOOL test_SecondaryClosePrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ct return False; } - status = dcerpc_bind_auth_none(p2, &dcerpc_table_spoolss); + status = dcerpc_bind_auth_none(p2, &ndr_table_spoolss); if (!NT_STATUS_IS_OK(status)) { printf("Failed to create bind on secondary connection\n"); talloc_free(p2); @@ -2086,7 +2086,7 @@ BOOL torture_rpc_spoolss(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_spoolss"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_spoolss); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_spoolss); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index eef7d2080d..c3d82a2715 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -1101,7 +1101,7 @@ BOOL torture_rpc_srvsvc(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_srvsvc"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_srvsvc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_srvsvc); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; @@ -1122,7 +1122,7 @@ BOOL torture_rpc_srvsvc(struct torture_context *torture) ret &= test_NetShareAddSetDel(p, mem_ctx); ret &= test_NetNameValidate(p, mem_ctx); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_srvsvc); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_srvsvc); if (!binding) { d_printf("You must specify a ncacn binding string\n"); @@ -1132,7 +1132,7 @@ BOOL torture_rpc_srvsvc(struct torture_context *torture) anon_credentials = cli_credentials_init_anon(mem_ctx); status = dcerpc_pipe_connect(mem_ctx, - &p, binding, &dcerpc_table_srvsvc, + &p, binding, &ndr_table_srvsvc, anon_credentials, NULL); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c index 29a5f33d12..c8fe877b7e 100644 --- a/source4/torture/rpc/svcctl.c +++ b/source4/torture/rpc/svcctl.c @@ -117,7 +117,7 @@ BOOL torture_rpc_svcctl(struct torture_context *torture) mem_ctx = talloc_init("torture_rpc_svcctl"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_svcctl); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_svcctl); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); return False; diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index a349178563..e6c4435618 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -139,13 +139,13 @@ struct test_join *torture_create_testuser(const char *username, status = dcerpc_pipe_connect(join, &join->p, dc_binding, - &dcerpc_table_samr, + &ndr_table_samr, cmdline_credentials, NULL); } else { status = torture_rpc_connection(join, &join->p, - &dcerpc_table_samr); + &ndr_table_samr); } if (!NT_STATUS_IS_OK(status)) { return NULL; diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c index 7ff28bf24b..6a8a664020 100644 --- a/source4/torture/rpc/unixinfo.c +++ b/source4/torture/rpc/unixinfo.c @@ -132,7 +132,7 @@ struct torture_suite *torture_rpc_unixinfo(void) suite = torture_suite_create(talloc_autofree_context(), "UNIXINFO"); tcase = torture_suite_add_rpc_iface_tcase(suite, "unixinfo", - &dcerpc_table_unixinfo); + &ndr_table_unixinfo); torture_rpc_tcase_add_test(tcase, "sidtouid", test_sidtouid); torture_rpc_tcase_add_test(tcase, "uidtosid", test_uidtosid); diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index 143be6defc..ac5b39b1e6 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -885,7 +885,7 @@ bool torture_rpc_winreg(struct torture_context *torture) int i; mem_ctx = talloc_init("torture_rpc_winreg"); - status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_winreg); + status = torture_rpc_connection(mem_ctx, &p, &ndr_table_winreg); if (!NT_STATUS_IS_OK(status)) { talloc_free(mem_ctx); diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c index 249f0075ce..49adcb7c29 100644 --- a/source4/torture/rpc/wkssvc.c +++ b/source4/torture/rpc/wkssvc.c @@ -84,7 +84,7 @@ struct torture_suite *torture_rpc_wkssvc(void) suite = torture_suite_create(talloc_autofree_context(), "WKSSVC"); tcase = torture_suite_add_rpc_iface_tcase(suite, "wkssvc", - &dcerpc_table_wkssvc); + &ndr_table_wkssvc); torture_rpc_tcase_add_test(tcase, "NetWkstaGetInfo", test_NetWkstaGetInfo); torture_rpc_tcase_add_test(tcase, "NetWkstaTransportEnum", |