diff options
| author | Günther Deschner <gd@samba.org> | 2013-05-24 13:44:00 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2013-08-05 10:30:00 +0200 |
| commit | 5c5cff0a722a0925ae75ea7aa11ede0d82d5b92d (patch) | |
| tree | 7669999a340655b4864ed17036a09c20c84a4ec6 | |
| parent | 8cd3a060514ddcc178c938100edfb0b177c00c8c (diff) | |
| download | samba-5c5cff0a722a0925ae75ea7aa11ede0d82d5b92d.tar.gz samba-5c5cff0a722a0925ae75ea7aa11ede0d82d5b92d.tar.bz2 samba-5c5cff0a722a0925ae75ea7aa11ede0d82d5b92d.zip | |
s3-rpc_cli: pass down ndr_interface_table to rpc_pipe_open_tcp().
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 8 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.h | 2 | ||||
| -rw-r--r-- | source3/torture/rpc_open_tcp.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 632a42b9ac..3934cc6996 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2635,19 +2635,19 @@ done: */ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host, const struct sockaddr_storage *addr, - const struct ndr_syntax_id *abstract_syntax, + const struct ndr_interface_table *table, struct rpc_pipe_client **presult) { NTSTATUS status; uint16_t port = 0; - status = rpc_pipe_get_tcp_port(host, addr, abstract_syntax, &port); + status = rpc_pipe_get_tcp_port(host, addr, &table->syntax_id, &port); if (!NT_STATUS_IS_OK(status)) { return status; } return rpc_pipe_open_tcp_port(mem_ctx, host, addr, port, - abstract_syntax, presult); + &table->syntax_id, presult); } /******************************************************************** @@ -2823,7 +2823,7 @@ static NTSTATUS cli_rpc_pipe_open(struct cli_state *cli, return rpc_pipe_open_tcp(NULL, smbXcli_conn_remote_name(cli->conn), smbXcli_conn_remote_sockaddr(cli->conn), - &table->syntax_id, presult); + table, presult); case NCACN_NP: return rpc_pipe_open_np(cli, table, presult); default: diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h index f37f8a9af6..6fcc5873bf 100644 --- a/source3/rpc_client/cli_pipe.h +++ b/source3/rpc_client/cli_pipe.h @@ -67,7 +67,7 @@ NTSTATUS rpccli_schannel_bind_data(TALLOC_CTX *mem_ctx, NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host, const struct sockaddr_storage *ss_addr, - const struct ndr_syntax_id *abstract_syntax, + const struct ndr_interface_table *table, struct rpc_pipe_client **presult); NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path, diff --git a/source3/torture/rpc_open_tcp.c b/source3/torture/rpc_open_tcp.c index d29f4cfbee..cd27b5ff20 100644 --- a/source3/torture/rpc_open_tcp.c +++ b/source3/torture/rpc_open_tcp.c @@ -95,7 +95,7 @@ int main(int argc, const char **argv) } status = rpc_pipe_open_tcp(mem_ctx, argv[2], NULL, - &((*table)->syntax_id), + *table, &rpc_pipe); if (!NT_STATUS_IS_OK(status)) { d_printf("ERROR calling rpc_pipe_open_tcp(): %s\n", |