From: Volker Lendecke Date: Sun, 24 Jan 2021 11:35:07 +0000 (+0100) Subject: epmapper: Simplify _epm_Map() X-Git-Tag: tevent-0.11.0~1876 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=895f459b4b2f347223f5b524d6b79090654cd1f4;p=thirdparty%2Fsamba.git epmapper: Simplify _epm_Map() We have a routine to compare ndr_syntax_id, don't do it manually. Signed-off-by: Volker Lendecke Reviewed-by: Samuel Cabrero --- diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c index 6d4d2d065b9..6164e221ca0 100644 --- a/source3/rpc_server/epmapper/srv_epmapper.c +++ b/source3/rpc_server/epmapper/srv_epmapper.c @@ -1002,8 +1002,7 @@ error_status_t _epm_Map(struct pipes_struct *p, dcerpc_floor_get_lhs_data(&floors[1], &ifid); if (floors[1].lhs.protocol != EPM_PROTOCOL_UUID || - !GUID_equal(&ifid.uuid, &ndr_transfer_syntax_ndr.uuid) || - ifid.if_version != ndr_transfer_syntax_ndr.if_version) { + !ndr_syntax_id_equal(&ifid, &ndr_transfer_syntax_ndr)) { rc = EPMAPPER_STATUS_NO_MORE_ENTRIES; goto done; } diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c index 1634b9f4eaf..d91fc8c0580 100644 --- a/source4/rpc_server/epmapper/rpc_epmapper.c +++ b/source4/rpc_server/epmapper/rpc_epmapper.c @@ -221,8 +221,7 @@ static error_status_t dcesrv_epm_Map(struct dcesrv_call_state *dce_call, TALLOC_ 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_syntax.uuid, &ndr_transfer_syntax_ndr.uuid) || - ndr_syntax.if_version != ndr_transfer_syntax_ndr.if_version) { + !ndr_syntax_id_equal(&ndr_syntax, &ndr_transfer_syntax_ndr)) { goto failed; }