diff options
72 files changed, 176 insertions, 176 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 2882e62596..a10d4254a3 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -2548,7 +2548,7 @@ static BOOL browse_host(const char *query_host) binding = talloc_asprintf(mem_ctx, "ncacn_np:%s", query_host); status = dcerpc_pipe_connect(mem_ctx, &p, binding, - &dcerpc_table_srvsvc, + &ndr_table_srvsvc, cmdline_credentials, NULL); if (!NT_STATUS_IS_OK(status)) { d_printf("Failed to connect to %s - %s\n", diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index db44232446..fce61d1184 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -76,7 +76,7 @@ static struct composite_context *dreplsrv_out_drsuapi_send(struct dreplsrv_out_c st->drsuapi = talloc_zero(st, struct dreplsrv_drsuapi_connection); if (composite_nomem(st->drsuapi, c)) return c; - creq = dcerpc_pipe_connect_b_send(st, conn->binding, &dcerpc_table_drsuapi, + creq = dcerpc_pipe_connect_b_send(st, conn->binding, &ndr_table_drsuapi, conn->service->system_session_info->credentials, c->event_ctx); composite_continue(c, creq, dreplsrv_out_drsuapi_connect_recv, st); diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 2f75857e06..ba23b19430 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -45,16 +45,16 @@ typedef NTSTATUS (*irpc_function_t)(struct irpc_message *, void *r); /* register a server function with the irpc messaging system */ #define IRPC_REGISTER(msg_ctx, pipename, funcname, function, private) \ - irpc_register(msg_ctx, &dcerpc_table_ ## pipename, \ + irpc_register(msg_ctx, &ndr_table_ ## pipename, \ DCERPC_ ## funcname, \ (irpc_function_t)function, private) /* make a irpc call */ #define IRPC_CALL(msg_ctx, server_id, pipename, funcname, ptr, ctx) \ - irpc_call(msg_ctx, server_id, &dcerpc_table_ ## pipename, DCERPC_ ## funcname, ptr, ctx) + irpc_call(msg_ctx, server_id, &ndr_table_ ## pipename, DCERPC_ ## funcname, ptr, ctx) #define IRPC_CALL_SEND(msg_ctx, server_id, pipename, funcname, ptr, ctx) \ - irpc_call_send(msg_ctx, server_id, &dcerpc_table_ ## pipename, DCERPC_ ## funcname, ptr, ctx) + irpc_call_send(msg_ctx, server_id, &ndr_table_ ## pipename, DCERPC_ ## funcname, ptr, ctx) /* diff --git a/source4/lib/registry/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc.c index dc6a2d86f1..50489aced2 100644 --- a/source4/lib/registry/reg_backend_rpc.c +++ b/source4/lib/registry/reg_backend_rpc.c @@ -372,7 +372,7 @@ _PUBLIC_ WERROR reg_open_remote(struct registry_context **ctx, struct auth_sessi status = dcerpc_pipe_connect(*ctx /* TALLOC_CTX */, &p, location, - &dcerpc_table_winreg, + &ndr_table_winreg, credentials, ev); (*ctx)->backend_data = p; diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c index 0e115b0547..5371879895 100644 --- a/source4/libcli/finddcs.c +++ b/source4/libcli/finddcs.c @@ -151,7 +151,7 @@ static void finddcs_name_resolved(struct composite_context *ctx) state->r.in.domain_sid = state->domain_sid; ireq = irpc_call_send(state->msg_ctx, nbt_servers[0], - &dcerpc_table_irpc, DCERPC_NBTD_GETDCNAME, + &ndr_table_irpc, DCERPC_NBTD_GETDCNAME, &state->r, state); if (!ireq) { fallback_node_status(state); diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c index a82f687053..d51ad5e12d 100644 --- a/source4/libcli/util/clilsa.c +++ b/source4/libcli/util/clilsa.c @@ -92,7 +92,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli) } /* bind to the LSA pipe */ - 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)) { talloc_free(lsa); return status; diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index fa2ef17ca7..e2f4f03c60 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -1522,7 +1522,7 @@ static void becomeDC_drsuapi_connect_send(struct libnet_BecomeDC_state *s, if (!composite_is_ok(c)) return; } - creq = dcerpc_pipe_connect_b_send(s, drsuapi->binding, &dcerpc_table_drsuapi, + creq = dcerpc_pipe_connect_b_send(s, drsuapi->binding, &ndr_table_drsuapi, s->libnet->cred, s->libnet->event_ctx); composite_continue(c, creq, recv_fn, s); } diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c index 3de281d625..6fd3b59a05 100644 --- a/source4/libnet/libnet_domain.c +++ b/source4/libnet/libnet_domain.c @@ -284,7 +284,7 @@ struct composite_context *libnet_DomainOpenSamr_send(struct libnet_context *ctx, /* attempting to connect a domain controller */ s->rpcconn.level = LIBNET_RPC_CONNECT_DC; s->rpcconn.in.name = io->in.domain_name; - s->rpcconn.in.dcerpc_iface = &dcerpc_table_samr; + s->rpcconn.in.dcerpc_iface = &ndr_table_samr; /* send rpc pipe connect request */ rpcconn_req = libnet_RpcConnect_send(ctx, c, &s->rpcconn, s->monitor_fn); @@ -427,7 +427,7 @@ struct composite_context* libnet_DomainOpenLsa_send(struct libnet_context *ctx, /* attempting to connect a domain controller */ s->rpcconn.level = LIBNET_RPC_CONNECT_DC; s->rpcconn.in.name = talloc_strdup(c, io->in.domain_name); - s->rpcconn.in.dcerpc_iface = &dcerpc_table_lsarpc; + s->rpcconn.in.dcerpc_iface = &ndr_table_lsarpc; /* send rpc pipe connect request */ rpcconn_req = libnet_RpcConnect_send(ctx, c, &s->rpcconn, s->monitor_fn); @@ -1175,7 +1175,7 @@ struct composite_context* libnet_DomainList_send(struct libnet_context *ctx, /* prepare rpc connect call */ s->rpcconn.level = LIBNET_RPC_CONNECT_SERVER; s->rpcconn.in.name = s->hostname; - s->rpcconn.in.dcerpc_iface = &dcerpc_table_samr; + s->rpcconn.in.dcerpc_iface = &ndr_table_samr; rpcconn_req = libnet_RpcConnect_send(ctx, c, &s->rpcconn, s->monitor_fn); if (composite_nomem(rpcconn_req, c)) return c; diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index cecf07ed4e..40debc63dc 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -110,7 +110,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J status = dcerpc_pipe_connect_b(tmp_ctx, &drsuapi_pipe, drsuapi_binding, - &dcerpc_table_drsuapi, + &ndr_table_drsuapi, ctx->cred, ctx->event_ctx); if (!NT_STATUS_IS_OK(status)) { @@ -479,7 +479,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru /* This level makes a connection to the LSA pipe on the way, * to get some useful bits of information about the domain */ connect_with_info->level = LIBNET_RPC_CONNECT_DC_INFO; - connect_with_info->in.dcerpc_iface = &dcerpc_table_samr; + connect_with_info->in.dcerpc_iface = &ndr_table_samr; /* establish the SAMR connection @@ -503,7 +503,7 @@ NTSTATUS libnet_JoinDomain(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru status = dcerpc_pipe_auth(tmp_ctx, &samr_pipe, connect_with_info->out.dcerpc_pipe->binding, - &dcerpc_table_samr, ctx->cred); + &ndr_table_samr, ctx->cred); if (!NT_STATUS_IS_OK(status)) { r->out.error_string = talloc_asprintf(mem_ctx, "SAMR bind failed: %s", diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index 5d3af7c2e8..28d9ae8cbe 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -54,7 +54,7 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT /* prepare connect to the SAMR pipe of the users domain PDC */ c.level = LIBNET_RPC_CONNECT_PDC; c.in.name = r->samr.in.domain_name; - c.in.dcerpc_iface = &dcerpc_table_samr; + c.in.dcerpc_iface = &ndr_table_samr; /* 1. connect to the SAMR pipe of users domain PDC (maybe a standalone server or workstation) */ status = libnet_RpcConnect(ctx, mem_ctx, &c); @@ -538,7 +538,7 @@ static NTSTATUS libnet_SetPassword_samr(struct libnet_context *ctx, TALLOC_CTX * /* prepare connect to the SAMR pipe of users domain PDC */ c.level = LIBNET_RPC_CONNECT_PDC; c.in.name = r->samr.in.domain_name; - c.in.dcerpc_iface = &dcerpc_table_samr; + c.in.dcerpc_iface = &ndr_table_samr; /* 1. connect to the SAMR pipe of users domain PDC (maybe a standalone server or workstation) */ status = libnet_RpcConnect(ctx, mem_ctx, &c); diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c index 02d7cf0c00..85dd6c43e7 100644 --- a/source4/libnet/libnet_rpc.c +++ b/source4/libnet/libnet_rpc.c @@ -186,10 +186,10 @@ static NTSTATUS libnet_RpcConnectSrv_recv(struct composite_context *c, /* reference created pipe structure to long-term libnet_context so that it can be used by other api functions even after short-term mem_ctx is freed */ - if (r->in.dcerpc_iface == &dcerpc_table_samr) { + if (r->in.dcerpc_iface == &ndr_table_samr) { ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe); - } else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) { + } else if (r->in.dcerpc_iface == &ndr_table_lsarpc) { ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe); } @@ -397,10 +397,10 @@ static NTSTATUS libnet_RpcConnectDC_recv(struct composite_context *c, /* reference created pipe structure to long-term libnet_context so that it can be used by other api functions even after short-term mem_ctx is freed */ - if (r->in.dcerpc_iface == &dcerpc_table_samr) { + if (r->in.dcerpc_iface == &ndr_table_samr) { ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe); - } else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) { + } else if (r->in.dcerpc_iface == &ndr_table_lsarpc) { ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe); } @@ -487,7 +487,7 @@ static struct composite_context* libnet_RpcConnectDCInfo_send(struct libnet_cont } /* we need to query information on lsarpc interface first */ - s->rpc_conn.in.dcerpc_iface = &dcerpc_table_lsarpc; + s->rpc_conn.in.dcerpc_iface = &ndr_table_lsarpc; /* request connection to the lsa pipe on the pdc */ conn_req = libnet_RpcConnect_send(ctx, c, &s->rpc_conn, s->monitor_fn); @@ -856,10 +856,10 @@ static NTSTATUS libnet_RpcConnectDCInfo_recv(struct composite_context *c, struct /* reference created pipe structure to long-term libnet_context so that it can be used by other api functions even after short-term mem_ctx is freed */ - if (r->in.dcerpc_iface == &dcerpc_table_samr) { + if (r->in.dcerpc_iface == &ndr_table_samr) { ctx->samr.pipe = talloc_reference(ctx, r->out.dcerpc_pipe); - } else if (r->in.dcerpc_iface == &dcerpc_table_lsarpc) { + } else if (r->in.dcerpc_iface == &ndr_table_lsarpc) { ctx->lsa.pipe = talloc_reference(ctx, r->out.dcerpc_pipe); } diff --git a/source4/libnet/libnet_share.c b/source4/libnet/libnet_share.c index 263e7c5119..e24ba8161a 100644 --- a/source4/libnet/libnet_share.c +++ b/source4/libnet/libnet_share.c @@ -37,7 +37,7 @@ NTSTATUS libnet_ListShares(struct libnet_context *ctx, c.level = LIBNET_RPC_CONNECT_SERVER; c.in.name = r->in.server_name; - c.in.dcerpc_iface = &dcerpc_table_srvsvc; + c.in.dcerpc_iface = &ndr_table_srvsvc; s.in.server_unc = talloc_asprintf(mem_ctx, "\\\\%s", c.in.name); @@ -118,7 +118,7 @@ NTSTATUS libnet_AddShare(struct libnet_context *ctx, c.level = LIBNET_RPC_CONNECT_SERVER; c.in.name = r->in.server_name; - c.in.dcerpc_iface = &dcerpc_table_srvsvc; + c.in.dcerpc_iface = &ndr_table_srvsvc; status = libnet_RpcConnect(ctx, mem_ctx, &c); if (!NT_STATUS_IS_OK(status)) { @@ -165,7 +165,7 @@ NTSTATUS libnet_DelShare(struct libnet_context *ctx, c.level = LIBNET_RPC_CONNECT_SERVER; c.in.name = r->in.server_name; - c.in.dcerpc_iface = &dcerpc_table_srvsvc; + c.in.dcerpc_iface = &ndr_table_srvsvc; status = libnet_RpcConnect(ctx, mem_ctx, &c); if (!NT_STATUS_IS_OK(status)) { diff --git a/source4/libnet/libnet_time.c b/source4/libnet/libnet_time.c index ef06577c21..e1e53fb947 100644 --- a/source4/libnet/libnet_time.c +++ b/source4/libnet/libnet_time.c @@ -35,7 +35,7 @@ static NTSTATUS libnet_RemoteTOD_srvsvc(struct libnet_context *ctx, TALLOC_CTX * /* prepare connect to the SRVSVC pipe of a timeserver */ c.level = LIBNET_RPC_CONNECT_SERVER; c.in.name = r->srvsvc.in.server_name; - c.in.dcerpc_iface = &dcerpc_table_srvsvc; + c.in.dcerpc_iface = &ndr_table_srvsvc; /* 1. connect to the SRVSVC pipe of a timeserver */ status = libnet_RpcConnect(ctx, mem_ctx, &c); diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index 6305ac9a5e..6b63ebc839 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -537,7 +537,7 @@ static void unbecomeDC_drsuapi_connect_send(struct libnet_UnbecomeDC_state *s) talloc_free(binding_str); if (!composite_is_ok(c)) return; - creq = dcerpc_pipe_connect_b_send(s, s->drsuapi.binding, &dcerpc_table_drsuapi, + creq = dcerpc_pipe_connect_b_send(s, s->drsuapi.binding, &ndr_table_drsuapi, s->libnet->cred, s->libnet->event_ctx); composite_continue(c, creq, unbecomeDC_drsuapi_connect_recv, s); } diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index d015a07730..e21976cb02 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -223,7 +223,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx } /* prepare connect to the NETLOGON pipe of PDC */ - c->in.dcerpc_iface = &dcerpc_table_netlogon; + c->in.dcerpc_iface = &ndr_table_netlogon; /* We must do this as the machine, not as any command-line * user. So we override the credentials in the @@ -268,7 +268,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx return nt_status; } - nt_status = dcerpc_bind_auth_schannel(samsync_ctx, p, &dcerpc_table_netlogon, + nt_status = dcerpc_bind_auth_schannel(samsync_ctx, p, &ndr_table_netlogon, machine_account, DCERPC_AUTH_LEVEL_PRIVACY); if (!NT_STATUS_IS_OK(nt_status)) { diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c index 2d43c96d3c..6b0a5a2455 100644 --- a/source4/librpc/rpc/dcerpc_schannel.c +++ b/source4/librpc/rpc/dcerpc_schannel.c @@ -102,7 +102,7 @@ static void continue_secondary_connection(struct composite_context *ctx) talloc_steal(s, s->pipe2); /* initiate a non-authenticated bind */ - auth_none_req = dcerpc_bind_auth_none_send(c, s->pipe2, &dcerpc_table_netlogon); + auth_none_req = dcerpc_bind_auth_none_send(c, s->pipe2, &ndr_table_netlogon); if (composite_nomem(auth_none_req, c)) return; composite_continue(c, auth_none_req, continue_bind_auth_none, c); @@ -261,7 +261,7 @@ struct composite_context *dcerpc_schannel_key_send(TALLOC_CTX *mem_ctx, /* request the netlogon endpoint mapping */ epm_map_req = dcerpc_epm_map_binding_send(c, s->binding, - &dcerpc_table_netlogon, + &ndr_table_netlogon, s->pipe->conn->event_ctx); if (composite_nomem(epm_map_req, c)) return c; diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index bb2d332c0b..66ce2bda85 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -956,7 +956,7 @@ struct composite_context *dcerpc_epm_map_binding_send(TALLOC_CTX *mem_ctx, epmapper_binding->endpoint = NULL; /* initiate rpc pipe connection */ - pipe_connect_req = dcerpc_pipe_connect_b_send(c, epmapper_binding, &dcerpc_table_epmapper, + pipe_connect_req = dcerpc_pipe_connect_b_send(c, epmapper_binding, &ndr_table_epmapper, anon_creds, c->event_ctx); if (composite_nomem(pipe_connect_req, c)) return c; diff --git a/source4/librpc/rpc/table.c b/source4/librpc/rpc/table.c index e08d670c99..eddc6c4a20 100644 --- a/source4/librpc/rpc/table.c +++ b/source4/librpc/rpc/table.c @@ -121,7 +121,7 @@ const struct ndr_interface_list *librpc_dcerpc_pipes(void) NTSTATUS dcerpc_register_builtin_interfaces(void); -NTSTATUS dcerpc_table_init(void) +NTSTATUS ndr_table_init(void) { static BOOL initialized = False; diff --git a/source4/librpc/tools/ndrdump.c b/source4/librpc/tools/ndrdump.c index 966ca9b98d..2e57e882d6 100644 --- a/source4/librpc/tools/ndrdump.c +++ b/source4/librpc/tools/ndrdump.c @@ -116,7 +116,7 @@ const struct ndr_interface_table *load_iface_from_plugin(const char *plugin, con return NULL; } - symbol = talloc_asprintf(NULL, "dcerpc_table_%s", pipe_name); + symbol = talloc_asprintf(NULL, "ndr_table_%s", pipe_name); p = dlsym(handle, symbol); if (!p) { @@ -164,7 +164,7 @@ const struct ndr_interface_table *load_iface_from_plugin(const char *plugin, con }; #if (_SAMBA_BUILD_ >= 4) - dcerpc_table_init(); + ndr_table_init(); #else /* Initialise samba stuff */ load_case_tables(); diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm index 0473341db3..4f4a49c1d4 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm @@ -690,7 +690,7 @@ sub EjsFunction($$$) my ($self, $d, $iface) = @_; my $name = $d->{NAME}; my $callnum = uc("DCERPC_$name"); - my $table = "&dcerpc_table_$iface"; + my $table = "&ndr_table_$iface"; $self->pidl("static int ejs_$name(int eid, int argc, struct MprVar **argv)"); $self->pidl("{"); diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm index bf8ac300ac..97d0e6dccb 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm @@ -34,7 +34,7 @@ struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ct NDR_PRINT_IN_DEBUG($name, r); } - return dcerpc_ndr_request_send(p, NULL, &dcerpc_table_$interface->{NAME}, DCERPC_$uname, mem_ctx, r); + return dcerpc_ndr_request_send(p, NULL, &ndr_table_$interface->{NAME}, DCERPC_$uname, mem_ctx, r); } NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r) @@ -74,7 +74,7 @@ sub ParseInterface($) $res_hdr .= "#define _HEADER_RPC_$interface->{NAME}\n\n"; if (defined $interface->{PROPERTIES}->{uuid}) { - $res_hdr .= "extern const struct ndr_interface_table dcerpc_table_$interface->{NAME};\n"; + $res_hdr .= "extern const struct ndr_interface_table ndr_table_$interface->{NAME};\n"; } $res .= "/* $interface->{NAME} - client functions generated by pidl */\n\n"; diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 91ceed1e62..5916cd1bf0 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2333,7 +2333,7 @@ sub FunctionTable($$) $self->pidl("};"); $self->pidl(""); - $self->pidl("\nconst struct ndr_interface_table dcerpc_table_$interface->{NAME} = {"); + $self->pidl("\nconst struct ndr_interface_table ndr_table_$interface->{NAME} = {"); $self->pidl("\t.name\t\t= \"$interface->{NAME}\","); $self->pidl("\t.syntax_id\t= {"); $self->pidl("\t\t" . print_uuid($interface->{UUID}) .","); @@ -2406,7 +2406,7 @@ sub HeaderInterface($$) if(!defined $interface->{PROPERTIES}->{helpstring}) { $interface->{PROPERTIES}->{helpstring} = "NULL"; } $self->pidl_hdr("#define DCERPC_$name\_HELPSTRING $interface->{PROPERTIES}->{helpstring}"); - $self->pidl_hdr("extern const struct ndr_interface_table dcerpc_table_$interface->{NAME};"); + $self->pidl_hdr("extern const struct ndr_interface_table ndr_table_$interface->{NAME};"); $self->pidl_hdr("NTSTATUS dcerpc_server_$interface->{NAME}_init(void);"); } diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm index bd58342189..269ccdded3 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm @@ -106,18 +106,18 @@ static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_C dce_call->fault_code = 0; - if (opnum >= dcerpc_table_$name.num_calls) { + if (opnum >= ndr_table_$name.num_calls) { dce_call->fault_code = DCERPC_FAULT_OP_RNG_ERROR; return NT_STATUS_NET_WRITE_FAULT; } - *r = talloc_size(mem_ctx, dcerpc_table_$name.calls[opnum].struct_size); + *r = talloc_size(mem_ctx, ndr_table_$name.calls[opnum].struct_size); NT_STATUS_HAVE_NO_MEMORY(*r); /* unravel the NDR for the packet */ - status = dcerpc_table_$name.calls[opnum].ndr_pull(pull, NDR_IN, *r); + status = ndr_table_$name.calls[opnum].ndr_pull(pull, NDR_IN, *r); if (!NT_STATUS_IS_OK(status)) { - dcerpc_log_packet(&dcerpc_table_$name, opnum, NDR_IN, + dcerpc_log_packet(&ndr_table_$name, opnum, NDR_IN, &dce_call->pkt.u.request.stub_and_verifier); dce_call->fault_code = DCERPC_FAULT_NDR; return NT_STATUS_NET_WRITE_FAULT; @@ -141,7 +141,7 @@ pidl " } if (dce_call->fault_code != 0) { - dcerpc_log_packet(&dcerpc_table_$name, opnum, NDR_IN, + dcerpc_log_packet(&ndr_table_$name, opnum, NDR_IN, &dce_call->pkt.u.request.stub_and_verifier); return NT_STATUS_NET_WRITE_FAULT; } @@ -164,7 +164,7 @@ pidl " } if (dce_call->fault_code != 0) { - dcerpc_log_packet(&dcerpc_table_$name, opnum, NDR_IN, + dcerpc_log_packet(&ndr_table_$name, opnum, NDR_IN, &dce_call->pkt.u.request.stub_and_verifier); return NT_STATUS_NET_WRITE_FAULT; } @@ -177,7 +177,7 @@ static NTSTATUS $name\__op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_C NTSTATUS status; uint16_t opnum = dce_call->pkt.u.request.opnum; - status = dcerpc_table_$name.calls[opnum].ndr_push(push, NDR_OUT, r); + status = ndr_table_$name.calls[opnum].ndr_push(push, NDR_OUT, r); if (!NT_STATUS_IS_OK(status)) { dce_call->fault_code = DCERPC_FAULT_NDR; return NT_STATUS_NET_WRITE_FAULT; @@ -213,9 +213,9 @@ static NTSTATUS $name\__op_init_server(struct dcesrv_context *dce_ctx, const str { int i; - for (i=0;i<dcerpc_table_$name.endpoints->count;i++) { + for (i=0;i<ndr_table_$name.endpoints->count;i++) { NTSTATUS ret; - const char *name = dcerpc_table_$name.endpoints->names[i]; + const char *name = ndr_table_$name.endpoints->names[i]; ret = dcesrv_interface_register(dce_ctx, name, &dcesrv_$name\_interface, NULL); if (!NT_STATUS_IS_OK(ret)) { diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm b/source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm index d541f318ee..df960d8de8 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/SWIG.pm @@ -52,7 +52,7 @@ sub ParseInterface($$) pidl "struct $if->{NAME} *ret = talloc(mem_ctx, struct $if->{NAME});"; pidl "NTSTATUS status;"; pidl ""; - pidl "status = dcerpc_pipe_connect(mem_ctx, &ret->pipe, binding, &dcerpc_table_$if->{NAME}, cred, event);"; + pidl "status = dcerpc_pipe_connect(mem_ctx, &ret->pipe, binding, &ndr_table_$if->{NAME}, cred, event);"; pidl "if (NT_STATUS_IS_ERR(status)) {"; pidl "\tntstatus_exception(status);"; pidl "\treturn NULL;"; diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c index 9a929e951c..e494c3644a 100644 --- a/source4/rpc_server/remote/dcesrv_remote.c +++ b/source4/rpc_server/remote/dcesrv_remote.c @@ -318,7 +318,7 @@ NTSTATUS dcerpc_server_remote_init(void) } /* We need the full DCE/RPC interface table */ - dcerpc_table_init(); + ndr_table_init(); return ret; } diff --git a/source4/scripting/ejs/smbcalls_rpc.c b/source4/scripting/ejs/smbcalls_rpc.c index 995760bfe1..aa4be7aa4a 100644 --- a/source4/scripting/ejs/smbcalls_rpc.c +++ b/source4/scripting/ejs/smbcalls_rpc.c @@ -370,7 +370,7 @@ done: */ int ejs_rpc_init(struct MprVar *obj, const char *name) { - dcerpc_table_init(); + ndr_table_init(); mprSetStringCFunction(obj, "connect", ejs_rpc_connect); if (mprGetProperty(obj, "pipe_name", NULL) == NULL) { diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c index d6b456317e..50b53300a4 100644 --- a/source4/torture/libnet/domain.c +++ b/source4/torture/libnet/domain.c @@ -88,7 +88,7 @@ BOOL torture_domainopen(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &net_ctx->samr.pipe, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c index 7023988f9b..2ececa690a 100644 --- a/source4/torture/libnet/libnet_domain.c +++ b/source4/torture/libnet/libnet_domain.c @@ -203,7 +203,7 @@ BOOL torture_domain_close_lsa(struct torture_context *torture) ctx->cred = cmdline_credentials; mem_ctx = talloc_init("torture_domain_close_lsa"); - status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &dcerpc_table_lsarpc, + status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &ndr_table_lsarpc, cmdline_credentials, NULL); if (!NT_STATUS_IS_OK(status)) { d_printf("failed to connect to server %s: %s\n", bindstr, @@ -339,7 +339,7 @@ BOOL torture_domain_close_samr(struct torture_context *torture) ctx->cred = cmdline_credentials; mem_ctx = talloc_init("torture_domain_close_samr"); - status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &dcerpc_table_samr, + status = dcerpc_pipe_connect(mem_ctx, &p, bindstr, &ndr_table_samr, ctx->cred, NULL); if (!NT_STATUS_IS_OK(status)) { d_printf("failed to connect to server %s: %s\n", bindstr, diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c index cfcee39c8e..d751a8e423 100644 --- a/source4/torture/libnet/libnet_rpc.c +++ b/source4/torture/libnet/libnet_rpc.c @@ -91,35 +91,35 @@ static BOOL torture_rpc_connect(struct torture_context *torture, ctx->cred = cmdline_credentials; d_printf("Testing connection to LSA interface\n"); - if (!test_connect_service(ctx, &dcerpc_table_lsarpc, bindstr, + if (!test_connect_service(ctx, &ndr_table_lsarpc, bindstr, hostname, level, False, NT_STATUS_OK)) { d_printf("failed to connect LSA interface\n"); return False; } d_printf("Testing connection to SAMR interface\n"); - if (!test_connect_service(ctx, &dcerpc_table_samr, bindstr, + if (!test_connect_service(ctx, &ndr_table_samr, bindstr, hostname, level, False, NT_STATUS_OK)) { d_printf("failed to connect SAMR interface\n"); return False; } d_printf("Testing connection to SRVSVC interface\n"); - if (!test_connect_service(ctx, &dcerpc_table_srvsvc, bindstr, + if (!test_connect_service(ctx, &ndr_table_srvsvc, bindstr, hostname, level, False, NT_STATUS_OK)) { d_printf("failed to connect SRVSVC interface\n"); return False; } d_printf("Testing connection to LSA interface with wrong credentials\n"); - if (!test_connect_service(ctx, &dcerpc_table_lsarpc, bindstr, + if (!test_connect_service(ctx, &ndr_table_lsarpc, bindstr, hostname, level, True, NT_STATUS_LOGON_FAILURE)) { d_printf("failed to test wrong credentials on LSA interface\n"); return False; } d_printf("Testing connection to SAMR interface with wrong credentials\n"); - if (!test_connect_service(ctx, &dcerpc_table_samr, bindstr, + if (!test_connect_service(ctx, &ndr_table_samr, bindstr, hostname, level, True, NT_STATUS_LOGON_FAILURE)) { d_printf("failed to test wrong credentials on SAMR interface\n"); return False; diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c index 36f43394cb..720246ed7e 100644 --- a/source4/torture/libnet/libnet_share.c +++ b/source4/torture/libnet/libnet_share.c @@ -224,7 +224,7 @@ BOOL torture_delshare(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_srvsvc); + &ndr_table_srvsvc); if (!test_addshare(p, mem_ctx, host, TEST_SHARENAME)) { ret = False; diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c index f501349373..03092d5c67 100644 --- a/source4/torture/libnet/libnet_user.c +++ b/source4/torture/libnet/libnet_user.c @@ -298,7 +298,7 @@ BOOL torture_deleteuser(struct torture_context *torture) status = torture_rpc_connection(prep_mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { ret = False; goto done; @@ -485,7 +485,7 @@ BOOL torture_modifyuser(struct torture_context *torture) status = torture_rpc_connection(prep_mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { ret = False; goto done; @@ -626,7 +626,7 @@ BOOL torture_userinfo_api(struct torture_context *torture) status = torture_rpc_connection(prep_mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; } diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c index 42050419f9..f7aa479952 100644 --- a/source4/torture/libnet/userinfo.c +++ b/source4/torture/libnet/userinfo.c @@ -316,7 +316,7 @@ BOOL torture_userinfo(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c index 7ffbe43fbb..cdc8bf0c52 100644 --- a/source4/torture/libnet/userman.c +++ b/source4/torture/libnet/userman.c @@ -491,7 +491,7 @@ BOOL torture_useradd(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; @@ -550,7 +550,7 @@ BOOL torture_userdel(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { return False; @@ -595,7 +595,7 @@ BOOL torture_usermod(struct torture_context *torture) status = torture_rpc_connection(mem_ctx, &p, - &dcerpc_table_samr); + &ndr_table_samr); if (!NT_STATUS_IS_OK(status)) { ret = False; 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", diff --git a/source4/winbind/wb_connect_sam.c b/source4/winbind/wb_connect_sam.c index e9adce9c19..49861b3c33 100644 --- a/source4/winbind/wb_connect_sam.c +++ b/source4/winbind/wb_connect_sam.c @@ -69,7 +69,7 @@ struct composite_context *wb_connect_samr_send(TALLOC_CTX *mem_ctx, secured with SPNEGO, NTLMSSP or SCHANNEL */ ctx = dcerpc_secondary_auth_connection_send(domain->netlogon_pipe, domain->samr_binding, - &dcerpc_table_samr, + &ndr_table_samr, domain->libnet_ctx->cred); composite_continue(state->ctx, ctx, connect_samr_recv_pipe, state); return result; diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 83769b1489..da03f0d406 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -157,7 +157,7 @@ struct composite_context *wb_init_domain_send(TALLOC_CTX *mem_ctx, cli_credentials_set_machine_account(state->domain->libnet_ctx->cred); if (!NT_STATUS_IS_OK(state->ctx->status)) goto failed; - state->domain->netlogon_binding = init_domain_binding(state, &dcerpc_table_netlogon); + state->domain->netlogon_binding = init_domain_binding(state, &ndr_table_netlogon); state->domain->netlogon_pipe = NULL; @@ -179,7 +179,7 @@ struct composite_context *wb_init_domain_send(TALLOC_CTX *mem_ctx, /* No encryption on anonymous pipes */ ctx = dcerpc_pipe_connect_b_send(state, state->domain->netlogon_binding, - &dcerpc_table_netlogon, + &ndr_table_netlogon, state->domain->libnet_ctx->cred, service->task->event_ctx); @@ -212,7 +212,7 @@ static void init_domain_recv_netlogonpipe(struct composite_context *ctx) } talloc_steal(state->domain->netlogon_pipe, state->domain->netlogon_binding); - state->domain->lsa_binding = init_domain_binding(state, &dcerpc_table_lsarpc); + state->domain->lsa_binding = init_domain_binding(state, &ndr_table_lsarpc); /* For debugging, it can be a real pain if all the traffic is encrypted */ if (lp_winbind_sealed_pipes()) { @@ -227,7 +227,7 @@ static void init_domain_recv_netlogonpipe(struct composite_context *ctx) secured with SPNEGO or NTLMSSP */ ctx = dcerpc_secondary_auth_connection_send(state->domain->netlogon_pipe, state->domain->lsa_binding, - &dcerpc_table_lsarpc, + &ndr_table_lsarpc, state->domain->libnet_ctx->cred ); composite_continue(state->ctx, ctx, init_domain_recv_lsa_pipe, state); @@ -275,7 +275,7 @@ static void init_domain_recv_lsa_pipe(struct composite_context *ctx) &state->domain->libnet_ctx->lsa.pipe); if (NT_STATUS_EQUAL(state->ctx->status, NT_STATUS_LOGON_FAILURE)) { if (retry_with_schannel(state, state->domain->lsa_binding, - &dcerpc_table_lsarpc, + &ndr_table_lsarpc, init_domain_recv_lsa_pipe)) { return; } @@ -315,7 +315,7 @@ static void init_domain_recv_lsa_policy(struct rpc_request *req) if ((!NT_STATUS_IS_OK(state->ctx->status) || !NT_STATUS_IS_OK(state->lsa_openpolicy.out.result))) { if (retry_with_schannel(state, state->domain->lsa_binding, - &dcerpc_table_lsarpc, + &ndr_table_lsarpc, init_domain_recv_lsa_pipe)) { return; } @@ -365,7 +365,7 @@ static void init_domain_recv_queryinfo(struct rpc_request *req) return; } - state->domain->samr_binding = init_domain_binding(state, &dcerpc_table_samr); + state->domain->samr_binding = init_domain_binding(state, &ndr_table_samr); /* We want to use the same flags as the LSA pipe did (so, if * it needed schannel, then we need that here too) */ |