diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-03-18 16:46:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-03-20 13:54:07 +0100 |
| commit | 95ca5fbadd390fe056ee2e8f9716ee478904458e (patch) | |
| tree | 42e63363688ffa6945a06121f1cd8215222403a8 /source4/rpc_server/dcerpc_server.c | |
| parent | 6058977f900c513eafe20201d0b1b0d13727ba13 (diff) | |
| download | samba-95ca5fbadd390fe056ee2e8f9716ee478904458e.tar.gz samba-95ca5fbadd390fe056ee2e8f9716ee478904458e.tar.bz2 samba-95ca5fbadd390fe056ee2e8f9716ee478904458e.zip | |
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.
Diffstat (limited to 'source4/rpc_server/dcerpc_server.c')
| -rw-r--r-- | source4/rpc_server/dcerpc_server.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 = ""; |