diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-30 23:00:40 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-02-11 16:20:30 +0100 |
| commit | 9a6201e6daf79f3c679227bd8fb41522f6dd8247 (patch) | |
| tree | 9699ba61ed24a83e8a390f9cf3549d6f17de534d /source4/torture/rpc | |
| parent | 81add4222a73728b2b6c42e07921cffb5a636c36 (diff) | |
| download | samba-9a6201e6daf79f3c679227bd8fb41522f6dd8247.tar.gz samba-9a6201e6daf79f3c679227bd8fb41522f6dd8247.tar.xz samba-9a6201e6daf79f3c679227bd8fb41522f6dd8247.zip | |
s4:torture/rpc: pass object down to test_Map_display()
We also pass the given tower unmodified first.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/epmapper.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index d45c01116fc..44f806ce60b 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -267,17 +267,18 @@ static bool test_Map_full(struct torture_context *tctx, static bool test_Map_display(struct dcerpc_binding_handle *b, struct torture_context *tctx, - struct epm_twr_t *twr) + struct epm_entry_t *entry) + { NTSTATUS status; + struct epm_twr_t *twr = entry->tower; struct epm_Map r; - struct GUID uuid; + struct GUID uuid = entry->object; struct policy_handle handle; struct ndr_syntax_id syntax; uint32_t num_towers; uint32_t i; - ZERO_STRUCT(uuid); ZERO_STRUCT(handle); r.in.object = &uuid; @@ -293,6 +294,15 @@ static bool test_Map_display(struct dcerpc_binding_handle *b, "epm_Map results for '%s':\n", ndr_interface_name(&syntax.uuid, syntax.if_version)); + status = dcerpc_epm_Map_r(b, tctx, &r); + if (NT_STATUS_IS_OK(status) && r.out.result == 0) { + for (i=0;i<*r.out.num_towers;i++) { + if (r.out.towers[i].twr) { + display_tower(tctx, &r.out.towers[i].twr->tower); + } + } + } + /* RPC protocol identifier */ twr->tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN; twr->tower.floors[2].lhs.lhs_data = data_blob(NULL, 0); @@ -332,7 +342,7 @@ static bool test_Map_display(struct dcerpc_binding_handle *b, twr->tower.floors[3].lhs.protocol = EPM_PROTOCOL_UDP; twr->tower.floors[3].lhs.lhs_data = data_blob(NULL, 0); - twr->tower.floors[3].rhs.http.port = 0; + twr->tower.floors[3].rhs.udp.port = 0; status = dcerpc_epm_Map_r(b, tctx, &r); if (NT_STATUS_IS_OK(status) && r.out.result == 0) { @@ -401,7 +411,7 @@ static bool test_Map_simple(struct torture_context *tctx, for (i = 0; i < *r.out.num_ents; i++) { if (r.out.entries[i].tower->tower.num_floors == 5) { - test_Map_display(h, tctx, r.out.entries[i].tower); + test_Map_display(h, tctx, &r.out.entries[i]); } } } while (NT_STATUS_IS_OK(status) && |