diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-22 16:55:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:24 -0500 |
| commit | 41848fea6fb3cea36caf0790302f7460b03d17c9 (patch) | |
| tree | 9d3f3897ba6eba28e5cc17aa4b252f4efb3cf699 /source4/librpc | |
| parent | ef9e094d848cee3dd61cf6521458d946df2e24d7 (diff) | |
| download | samba-41848fea6fb3cea36caf0790302f7460b03d17c9.tar.gz samba-41848fea6fb3cea36caf0790302f7460b03d17c9.tar.bz2 samba-41848fea6fb3cea36caf0790302f7460b03d17c9.zip | |
r19844: Fix warnings and errors in epmapper IDL.
(This used to be commit 0221d5b6c4250a3a2c86c623c534996d7decb1f6)
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/idl/epmapper.idl | 11 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl index 223883c366..c94842bedd 100644 --- a/source4/librpc/idl/epmapper.idl +++ b/source4/librpc/idl/epmapper.idl @@ -14,8 +14,7 @@ http://www.opengroup.org/onlinepubs/9629399/chap6.htm#tagcjh_11_02_03_01: bindin endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:[EPMAPPER]"), helpstring("EndPoint Mapper"), - pointer_default_top(sptr), - pointer_default(sptr) + pointer_default(ptr) ] interface epmapper { @@ -254,8 +253,8 @@ interface epmapper [in] uint32 vers_option, [in,out,ref] policy_handle *entry_handle, [in] uint32 max_ents, - [out] uint32 num_ents, - [out, length_is(num_ents), size_is(max_ents)] epm_entry_t entries[] + [out] uint32 *num_ents, + [out, length_is(*num_ents), size_is(max_ents)] epm_entry_t entries[] ); @@ -271,8 +270,8 @@ interface epmapper [in] epm_twr_t *map_tower, [in,out,ref] policy_handle *entry_handle, [in] uint32 max_towers, - [out] uint32 num_towers, - [out, length_is(num_towers), size_is(max_towers)] epm_twr_p_t towers[] + [out] uint32 *num_towers, + [out, length_is(*num_towers), size_is(max_towers)] epm_twr_p_t towers[] ); diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index bdc0f8f6c5..978cc5cd3e 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -797,6 +797,8 @@ static void continue_epm_recv_binding(struct composite_context *ctx) c->status = dcerpc_pipe_connect_b_recv(ctx, c, &s->pipe); if (!composite_is_ok(c)) return; + s->pipe->conn->flags |= DCERPC_NDR_REF_ALLOC; + /* prepare requested binding parameters */ s->binding->object = s->table->syntax_id; @@ -833,7 +835,7 @@ static void continue_epm_map(struct rpc_request *req) if (!composite_is_ok(c)) return; /* check the details */ - if (s->r.out.result != 0 || s->r.out.num_towers != 1) { + if (s->r.out.result != 0 || *s->r.out.num_towers != 1) { composite_error(c, NT_STATUS_PORT_UNREACHABLE); return; } |