epmapper: Simplify _epm_Map()

We have a routine to compare ndr_syntax_id, don't do it manually.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Samuel Cabrero <scabrero@samba.org>

diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index 6d4d2d065b9ba78fee2446fc030cc59d941b42e8..6164e221ca0bb3dafd4ca880b083a8ebd84ad50c 100644 (file)
--- 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 1634b9f4eafb6635222d3d153d869ab81bea8d52..d91fc8c0580fae8022b172d8e8b436ecc141894e 100644 (file)
--- 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;
        }