diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-08 19:38:01 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-08 19:43:47 +0100 |
| commit | e181b889784e6aed47e2fcc86add736d0b04daf2 (patch) | |
| tree | 2bf46748bfa1eb83756d7ebce645304c6b4555dd /source3/include | |
| parent | 27847e8386a005b4369d99cad62215a113a0a0f9 (diff) | |
| download | samba-e181b889784e6aed47e2fcc86add736d0b04daf2.tar.gz samba-e181b889784e6aed47e2fcc86add736d0b04daf2.tar.bz2 samba-e181b889784e6aed47e2fcc86add736d0b04daf2.zip | |
Revert "s3: Do not reference ndr_table_<pipe> in the cli_ routines directly"
This reverts commit daa964013bc5d036f4da571ce22c0052ef40943a.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/client.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 16 |
2 files changed, 7 insertions, 13 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 3b3931bb6b..82d94b055f 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -123,14 +123,14 @@ struct rpc_pipe_client { NTSTATUS (*dispatch) (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - const char *interface, uint32_t interface_version, + const struct ndr_interface_table *table, uint32_t opnum, void *r); struct tevent_req *(*dispatch_send)( TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct rpc_pipe_client *cli, - const char *interface, uint32_t interface_version, + const struct ndr_interface_table *table, uint32_t opnum, void *r); NTSTATUS (*dispatch_recv)(struct tevent_req *req, diff --git a/source3/include/proto.h b/source3/include/proto.h index a0355732e7..8ee5591e05 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5310,13 +5310,8 @@ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host, NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path, const struct ndr_syntax_id *abstract_syntax, struct rpc_pipe_client **presult); -NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, - const struct ndr_syntax_id *abstract_syntax, - NTSTATUS (*dispatch) (struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *interface, - uint32_t interface_version, - uint32_t opnum, void *r), +NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax, + NTSTATUS (*dispatch) (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r), struct auth_serversupplied_info *serversupplied_info, struct rpc_pipe_client **presult); NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli, @@ -5639,15 +5634,14 @@ void init_samr_CryptPassword(const char *pwd, struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct rpc_pipe_client *cli, - const char *interface, - uint32_t interface_version, + const struct ndr_interface_table *table, uint32_t opnum, void *r); NTSTATUS cli_do_rpc_ndr_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx); NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - const char *interface, uint32_t interface_version, - uint32_t opnum, void *r); + const struct ndr_interface_table *table, + uint32 opnum, void *r); /* The following definitions come from rpc_parse/parse_misc.c */ |