diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-07 21:30:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:38 -0500 |
| commit | f2d715cd858833e87a57d99ff6716e6af045558a (patch) | |
| tree | 945dbd40775a42fb50bea2a1a15f26cc76c2c033 /source4/build | |
| parent | add049380ea964a430c60e668e4dffd7ed81156e (diff) | |
| download | samba-f2d715cd858833e87a57d99ff6716e6af045558a.tar.gz samba-f2d715cd858833e87a57d99ff6716e6af045558a.tar.bz2 samba-f2d715cd858833e87a57d99ff6716e6af045558a.zip | |
r3606: More DCOM fixes:
- OXID tables work now. IOXIDResolver is used if there is used for getting a STRINGBINDING if none is known yet
- Add custom dissectors for STRINGARRAY and DUALSTRINGARRAY. If there's a way to get rid of these later on (by supporting them thru pidl somehow), I'd be happy to use that instead of doing it manually.
I can now get to the point where we have created an object and are connected to
it. The only thing left to do is being able to set the Object UUID properly..
(This used to be commit 54e1e5edca50d3cd496c080715e84ec62cb2a10c)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/pidl/client.pm | 4 | ||||
| -rw-r--r-- | source4/build/pidl/parser.pm | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/build/pidl/client.pm b/source4/build/pidl/client.pm index d9d2a0ca14..9502c68e1a 100644 --- a/source4/build/pidl/client.pm +++ b/source4/build/pidl/client.pm @@ -69,6 +69,7 @@ NTSTATUS dcerpc_$name(struct dcom_interface *d, TALLOC_CTX *mem_ctx, struct $nam } "; + $objarg = "d"; } else { $res .= " @@ -77,10 +78,11 @@ NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name * struct rpc_request *req; NTSTATUS status; "; + $objarg = "p"; } $res .= " - req = dcerpc_$name\_send(p, mem_ctx, r); + req = dcerpc_$name\_send($objarg, mem_ctx, r); if (req == NULL) return NT_STATUS_NO_MEMORY; status = dcerpc_ndr_request_recv(req); diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm index 39ec8a89a0..2ace0fdd8f 100644 --- a/source4/build/pidl/parser.pm +++ b/source4/build/pidl/parser.pm @@ -162,10 +162,7 @@ sub struct_alignment for my $e (@{$s->{ELEMENTS}}) { my $a = 1; - if (util::has_property($e, "align")) - { - $a = $e->{PROPERTIES}->{align}; - } elsif (!util::need_wire_pointer($e) + if (!util::need_wire_pointer($e) && defined $structs{$e->{TYPE}}) { if ($structs{$e->{TYPE}}->{DATA}->{TYPE} eq "STRUCT") { $a = struct_alignment($structs{$e->{TYPE}}->{DATA}); |