From 42da534d66c14c60844568246a2862da7b49f1d5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 26 Mar 2006 00:59:17 +0000 Subject: r14735: Use dcerpc_syntax_id rather then seperate GUID + if_version everywhere (This used to be commit a316b33057f3ec8532677980e093cd327d33f257) --- source4/torture/rpc/epmapper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source4/torture/rpc/epmapper.c') diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 9e477625db..e0abdcff0b 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -48,8 +48,7 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct GUID uuid; struct policy_handle handle; int i; - struct GUID if_uuid; - uint16_t if_version; + struct dcerpc_syntax_id syntax; ZERO_STRUCT(uuid); ZERO_STRUCT(handle); @@ -60,10 +59,10 @@ static BOOL test_Map(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, r.out.entry_handle = &handle; r.in.max_towers = 100; - dcerpc_floor_get_lhs_data(&twr->tower.floors[0], &if_uuid, &if_version); + dcerpc_floor_get_lhs_data(&twr->tower.floors[0], &syntax); printf("epm_Map results for '%s':\n", - idl_pipe_name(&if_uuid, if_version)); + idl_pipe_name(&syntax.uuid, syntax.if_version)); twr->tower.floors[2].lhs.protocol = EPM_PROTOCOL_NCACN; twr->tower.floors[2].lhs.lhs_data = data_blob(NULL, 0); @@ -261,7 +260,7 @@ static BOOL test_InqObject(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) struct epm_InqObject r; r.in.epm_object = talloc(mem_ctx, struct GUID); - *r.in.epm_object = dcerpc_table_epmapper.uuid; + *r.in.epm_object = dcerpc_table_epmapper.syntax_id.uuid; status = dcerpc_epm_InqObject(p, mem_ctx, &r); if (NT_STATUS_IS_ERR(status)) { -- cgit