sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-30 17:49:30 +03:00
Code Activity

s4:rpc_server/epmapper: use ndr_syntax_id_equal() in dcesrv_epm_Map() to match the request

Browse Source 
This matches it much easier to understand.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher
2023-10-13 09:18:25 +02:00
committed by Andrew Bartlett
parent 53e4fe647e
commit 5ec5496df4
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source4/rpc_server/epmapper/rpc_epmapper.c
View File

@ -192,6 +192,7 @@ static error_status_t dcesrv_epm_Map(struct dcesrv_call_state *dce_call, TALLOC_
struct dcesrv_ep_iface *eps; struct dcesrv_ep_iface *eps;
struct epm_floor *floors; struct epm_floor *floors;
enum dcerpc_transport_t transport; enum dcerpc_transport_t transport;
struct ndr_syntax_id abstract_syntax;
struct ndr_syntax_id ndr_syntax; struct ndr_syntax_id ndr_syntax;
NTSTATUS status; NTSTATUS status;
@ -219,6 +220,11 @@ static error_status_t dcesrv_epm_Map(struct dcesrv_call_state *dce_call, TALLOC_
floors = r->in.map_tower->tower.floors; floors = r->in.map_tower->tower.floors;
status = dcerpc_floor_get_uuid_full(&floors[0], &abstract_syntax);
if (!NT_STATUS_IS_OK(status)) {
goto failed;
}
status = dcerpc_floor_get_uuid_full(&floors[1], &ndr_syntax); status = dcerpc_floor_get_uuid_full(&floors[1], &ndr_syntax);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
goto failed; goto failed;
@ -240,15 +246,22 @@ static error_status_t dcesrv_epm_Map(struct dcesrv_call_state *dce_call, TALLOC_
} }
for (i=0;i<count;i++) { for (i=0;i<count;i++) {
int cmp; struct ndr_syntax_id ep_abstract_syntax;
int match;
if (transport != dcerpc_transport_by_tower(&eps[i].ep)) { if (transport != dcerpc_transport_by_tower(&eps[i].ep)) {
continue; continue;
} }
cmp = data_blob_cmp(&r->in.map_tower->tower.floors[0].lhs.lhs_data, status = dcerpc_floor_get_uuid_full(&eps[i].ep.floors[0],
&eps[i].ep.floors[0].lhs.lhs_data); &ep_abstract_syntax);
if (cmp != 0) { if (!NT_STATUS_IS_OK(status)) {
continue;
}
match = ndr_syntax_id_equal(&ep_abstract_syntax,
&abstract_syntax);
if (!match) {
continue; continue;
} }