From 95ca5fbadd390fe056ee2e8f9716ee478904458e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 Mar 2012 16:46:57 +0100 Subject: libndr: Rename ndr64_transfer_syntax and null_ndr_syntax_id so they have a ndr_ prefix. This makes the NDR namespace a bit clearer, in preparation of ABI checking. --- source4/rpc_server/dcerpc_server.c | 12 ++++++------ source4/rpc_server/epmapper/rpc_epmapper.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index a16e6ac9d5..389cbe3666 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -544,8 +544,8 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) transfer_syntax_version = call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].if_version; transfer_syntax_uuid = &call->pkt.u.bind.ctx_list[0].transfer_syntaxes[0].uuid; - if (!GUID_equal(&ndr_transfer_syntax.uuid, transfer_syntax_uuid) != 0 || - ndr_transfer_syntax.if_version != transfer_syntax_version) { + if (!GUID_equal(&ndr_transfer_syntax_ndr.uuid, transfer_syntax_uuid) != 0 || + ndr_transfer_syntax_ndr.if_version != transfer_syntax_version) { char *uuid_str = GUID_string(call, transfer_syntax_uuid); /* we only do NDR encoded dcerpc */ DEBUG(0,("Non NDR transfer syntax requested - %s\n", uuid_str)); @@ -657,7 +657,7 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call) } pkt.u.bind_ack.ctx_list[0].result = result; pkt.u.bind_ack.ctx_list[0].reason = reason; - pkt.u.bind_ack.ctx_list[0].syntax = ndr_transfer_syntax; + pkt.u.bind_ack.ctx_list[0].syntax = ndr_transfer_syntax_ndr; pkt.u.bind_ack.auth_info = data_blob(NULL, 0); status = dcesrv_auth_bind_ack(call, &pkt); @@ -731,8 +731,8 @@ static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_ transfer_syntax_version = call->pkt.u.alter.ctx_list[0].transfer_syntaxes[0].if_version; transfer_syntax_uuid = &call->pkt.u.alter.ctx_list[0].transfer_syntaxes[0].uuid; - if (!GUID_equal(transfer_syntax_uuid, &ndr_transfer_syntax.uuid) || - ndr_transfer_syntax.if_version != transfer_syntax_version) { + if (!GUID_equal(transfer_syntax_uuid, &ndr_transfer_syntax_ndr.uuid) || + ndr_transfer_syntax_ndr.if_version != transfer_syntax_version) { /* we only do NDR encoded dcerpc */ return NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED; } @@ -846,7 +846,7 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call) } pkt.u.alter_resp.ctx_list[0].result = result; pkt.u.alter_resp.ctx_list[0].reason = reason; - pkt.u.alter_resp.ctx_list[0].syntax = ndr_transfer_syntax; + pkt.u.alter_resp.ctx_list[0].syntax = ndr_transfer_syntax_ndr; pkt.u.alter_resp.auth_info = data_blob(NULL, 0); pkt.u.alter_resp.secondary_address = ""; diff --git a/source4/rpc_server/epmapper/rpc_epmapper.c b/source4/rpc_server/epmapper/rpc_epmapper.c index 87bfee6dc3..371a3b5dd5 100644 --- a/source4/rpc_server/epmapper/rpc_epmapper.c +++ b/source4/rpc_server/epmapper/rpc_epmapper.c @@ -201,8 +201,8 @@ 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.uuid) || - ndr_syntax.if_version != ndr_transfer_syntax.if_version) { + !GUID_equal(&ndr_syntax.uuid, &ndr_transfer_syntax_ndr.uuid) || + ndr_syntax.if_version != ndr_transfer_syntax_ndr.if_version) { goto failed; } -- cgit