summaryrefslogtreecommitdiff
path: root/pidl/lib/Parse/Pidl
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-08 19:38:01 +0100
committerVolker Lendecke <vl@samba.org>2009-11-08 19:43:47 +0100
commite181b889784e6aed47e2fcc86add736d0b04daf2 (patch)
tree2bf46748bfa1eb83756d7ebce645304c6b4555dd /pidl/lib/Parse/Pidl
parent27847e8386a005b4369d99cad62215a113a0a0f9 (diff)
downloadsamba-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 'pidl/lib/Parse/Pidl')
-rw-r--r--pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm4
-rw-r--r--pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm4
2 files changed, 4 insertions, 4 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 53ca52e979..3fc63a4999 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -223,7 +223,7 @@ sub ParseFunctionAsyncSend($$$)
$self->pidl("");
$self->pidl("subreq = cli->dispatch_send(state, ev, cli,");
- $self->pidl("\t\t\t NDR_".$uif."_UUID, NDR_".$uif."_VERSION,");
+ $self->pidl("\t\t\t &ndr_table_$if,");
$self->pidl("\t\t\t $ufn,");
$self->pidl("\t\t\t &state->tmp);");
$self->pidl("if (tevent_req_nomem(subreq, req)) {");
@@ -387,7 +387,7 @@ sub ParseFunctionSync($$$)
$self->pidl("");
$self->pidl("status = cli->dispatch(cli,");
$self->pidl("\t\t\tmem_ctx,");
- $self->pidl("\t\t\tNDR_".$uif."_UUID, NDR_".$uif."_VERSION,");
+ $self->pidl("\t\t\t&ndr_table_$if,");
$self->pidl("\t\t\t$ufn,");
$self->pidl("\t\t\t&r);");
$self->pidl("");
diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index fca55563ab..5599de9d79 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -226,8 +226,8 @@ sub ParseDispatchFunction($)
{
my ($if) = @_;
- pidl_hdr "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *r);";
- pidl "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *interface, uint32_t interface_version, uint32_t opnum, void *_r)";
+ pidl_hdr "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r);";
+ pidl "NTSTATUS rpc_$if->{NAME}_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *_r)";
pidl "{";
indent;
pidl "if (cli->pipes_struct == NULL) {";