diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-26 00:59:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:59:17 -0500 |
| commit | 42da534d66c14c60844568246a2862da7b49f1d5 (patch) | |
| tree | 4c8156ae3cb44be0483bce10b5f60bad1bd286c7 /source4/rpc_server/epmapper | |
| parent | 7780e2bfa1e446d02a0168e85bf7713fd4ce475b (diff) | |
| download | samba-42da534d66c14c60844568246a2862da7b49f1d5.tar.gz samba-42da534d66c14c60844568246a2862da7b49f1d5.tar.bz2 samba-42da534d66c14c60844568246a2862da7b49f1d5.zip | |
r14735: Use dcerpc_syntax_id rather then seperate GUID + if_version everywhere
(This used to be commit a316b33057f3ec8532677980e093cd327d33f257)
Diffstat (limited to 'source4/rpc_server/epmapper')
| -rw-r--r-- | source4/rpc_server/epmapper/rpc_epmapper.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c index 8ff4ffdf2d..2c8b56b893 100644 --- a/source4/rpc_server/epmapper/rpc_epmapper.c +++ b/source4/rpc_server/epmapper/rpc_epmapper.c @@ -65,8 +65,7 @@ static uint32_t build_ep_list(TALLOC_CTX *mem_ctx, (*eps)[total].name = iface->iface.name; description = d->ep_description; - description->object = iface->iface.uuid; - description->object_version = iface->iface.if_version; + description->object = iface->iface.syntax_id; status = dcerpc_binding_build_tower(mem_ctx, description, &(*eps)[total].ep); if (NT_STATUS_IS_ERR(status)) { @@ -175,8 +174,7 @@ static error_status_t epm_Map(struct dcesrv_call_state *dce_call, TALLOC_CTX *me struct dcesrv_ep_iface *eps; struct epm_floor *floors; enum dcerpc_transport_t transport; - struct GUID ndr_uuid; - uint16_t ndr_version; + struct dcerpc_syntax_id ndr_syntax; count = build_ep_list(mem_ctx, dce_call->conn->dce_ctx->endpoint_list, &eps); @@ -198,11 +196,11 @@ static error_status_t epm_Map(struct dcesrv_call_state *dce_call, TALLOC_CTX *me floors = r->in.map_tower->tower.floors; - dcerpc_floor_get_lhs_data(&r->in.map_tower->tower.floors[1], &ndr_uuid, &ndr_version); + dcerpc_floor_get_lhs_data(&r->in.map_tower->tower.floors[1], &ndr_syntax); if (floors[1].lhs.protocol != EPM_PROTOCOL_UUID || - !GUID_equal(&ndr_uuid, &ndr_transfer_syntax.uuid) || - ndr_version != ndr_transfer_syntax.if_version) { + !GUID_equal(&ndr_syntax.uuid, &ndr_transfer_syntax.uuid) || + ndr_syntax.if_version != ndr_transfer_syntax.if_version) { goto failed; } |