The branch, master has been updated
via 1a96ec2 pidl:Samba4/NDR/Client: remove compat mode for dcerpc_pipe
based bindings
via b7d6d3b s3:librpc: remove prototype of
dcerpc_binding_handle_set_ref_alloc()
from 78b931c Remove all uses of "./" in pathnames - make canonical. This
will become important when we need to guarantee canonical names for hashing.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1a96ec21095c3524558b9a28643f84a28701db13
Author: Stefan Metzmacher <me...@samba.org>
Date: Sat Jan 15 08:59:16 2011 +0100
pidl:Samba4/NDR/Client: remove compat mode for dcerpc_pipe based bindings
The only consumer "openchange" uses the dcerpc_binding_handle based
functions now.
metze
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Fri Jan 21 08:16:25 CET 2011 on sn-devel-104
commit b7d6d3b840df959fe6a0df6810c8601872d57649
Author: Stefan Metzmacher <me...@samba.org>
Date: Sat Jan 15 08:55:28 2011 +0100
s3:librpc: remove prototype of dcerpc_binding_handle_set_ref_alloc()
This function doesn't exist anymore.
metze
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 57 ------------------------------
source3/librpc/rpc/dcerpc.h | 3 --
2 files changed, 0 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 3230958..2397f1a 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -220,49 +220,6 @@ sub ParseFunction_r_Sync($$$$)
$self->pidl("");
}
-sub ParseFunction_Compat_Sync($$$$)
-{
- my ($self, $if, $fn, $name) = @_;
- my $uname = uc $name;
-
- my $proto = "NTSTATUS dcerpc_$name\_compat(struct dcerpc_pipe *p,
TALLOC_CTX *mem_ctx, struct $name *r)";
-
- $self->pidl_hdr("#ifdef DCERPC_CALL_$uname\_COMPAT");
- $self->pidl_hdr("#define dcerpc_$name(p, m, r) dcerpc_$name\_compat(p,
m, r)");
- $self->pidl_hdr("#endif /* DCERPC_CALL_$uname\_COMPAT */");
-
- $self->fn_declare($proto);
- $self->pidl("{");
- $self->indent;
- $self->pidl("NTSTATUS status;");
- $self->pidl("");
-
- $self->pidl("status = dcerpc_$name\_r(p->binding_handle, mem_ctx, r);");
- $self->pidl("");
-
- $self->pidl("if (NT_STATUS_IS_RPC(status)) {");
- $self->indent;
- $self->pidl("status = NT_STATUS_NET_WRITE_FAULT;");
- $self->deindent;
- $self->pidl("}");
- $self->pidl("");
-
- if (defined($fn->{RETURN_TYPE}) and $fn->{RETURN_TYPE} eq "NTSTATUS") {
- $self->pidl("if (NT_STATUS_IS_OK(status)) {");
- $self->indent;
- $self->pidl("status = r->out.result;");
- $self->deindent;
- $self->pidl("}");
- $self->pidl("");
- }
-
- $self->pidl("return status;");
-
- $self->deindent;
- $self->pidl("}");
- $self->pidl("");
-}
-
sub ElementDirection($)
{
my ($e) = @_;
@@ -682,9 +639,7 @@ sub ParseFunction_Sync($$$$)
$fn_args .= ",\n" . $pad . mapTypeName($fn->{RETURN_TYPE}). "
*result";
}
- $self->pidl_hdr("#ifndef DCERPC_CALL_$uname\_COMPAT");
$self->fn_declare("$fn_str($fn_args)");
- $self->pidl_hdr("#endif /* DCERPC_CALL_$uname\_COMPAT */");
$self->pidl("{");
$self->indent;
$self->pidl("struct $name r;");
@@ -740,8 +695,6 @@ sub ParseFunction($$$)
$self->ParseFunction_r_Recv($if, $fn, $fn->{NAME});
$self->ParseFunction_r_Sync($if, $fn, $fn->{NAME});
- $self->ParseFunction_Compat_Sync($if, $fn, $fn->{NAME});
-
foreach my $e (@{$fn->{ELEMENTS}}) {
next unless (grep(/out/, @{$e->{DIRECTION}}));
@@ -811,16 +764,6 @@ sub ParseInterface($$)
$self->pidl_hdr("");
}
- $self->pidl_hdr("#ifdef DCERPC_IFACE_$ifu\_COMPAT");
- foreach my $fn (@{$if->{FUNCTIONS}}) {
- next if has_property($fn, "noopnum");
- next if has_property($fn, "todo");
- my $fnu = uc($fn->{NAME});
- $self->pidl_hdr("#define DCERPC_CALL_$fnu\_COMPAT 1");
- }
- $self->pidl_hdr("#endif /* DCERPC_IFACE_$ifu\_COMPAT */");
- $self->pidl_hdr("");
-
$self->pidl("/* $if->{NAME} - client functions generated by pidl */");
$self->pidl("");
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 3183645..ea6aea7 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -259,9 +259,6 @@ void *_dcerpc_binding_handle_data(struct
dcerpc_binding_handle *h);
#define dcerpc_binding_handle_data(_h, _type) \
talloc_get_type_abort(_dcerpc_binding_handle_data(_h), _type)
-_DEPRECATED_ void dcerpc_binding_handle_set_ref_alloc(struct
dcerpc_binding_handle *h,
- bool ref_alloc);
-
_DEPRECATED_ void dcerpc_binding_handle_set_sync_ev(struct
dcerpc_binding_handle *h,
struct tevent_context *ev);
--
Samba Shared Repository
