summaryrefslogtreecommitdiff
path: root/pidl
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-08 19:38:01 +0100
committerKarolin Seeger <kseeger@samba.org>2009-11-26 11:40:29 +0100
commit0d6aa765e0298a55a331c16df75d1cad80d96e23 (patch)
tree2365b8b17afa0a3c6cea7b8a1b0394693dbaf4a1 /pidl
parent3fbc10766faa44b8b80058f2dae7ff6d4f9fc49a (diff)
downloadsamba-0d6aa765e0298a55a331c16df75d1cad80d96e23.tar.gz
Revert "s3: Do not reference ndr_table_<pipe> in the cli_ routines directly"
This reverts commit daa964013bc5d036f4da571ce22c0052ef40943a. (cherry picked from commit 28746a943b29dfdf2837bb17bf70fb4122f00220)
Diffstat (limited to '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 53ca52e9795..3fc63a49991 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 fca55563abc..5599de9d790 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) {";