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. --- source3/rpc_client/cli_pipe.c | 6 +++--- source3/rpc_server/epmapper/srv_epmapper.c | 4 ++-- source3/rpc_server/rpc_ncacn_np.c | 4 ++-- source3/rpc_server/srv_pipe.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source3') diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 12f911b9fd..db89b3165b 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2280,7 +2280,7 @@ static NTSTATUS rpc_pipe_open_tcp_port(TALLOC_CTX *mem_ctx, const char *host, } result->abstract_syntax = *abstract_syntax; - result->transfer_syntax = ndr_transfer_syntax; + result->transfer_syntax = ndr_transfer_syntax_ndr; result->desthost = talloc_strdup(result, host); result->srv_name_slash = talloc_asprintf_strupper_m( @@ -2509,7 +2509,7 @@ NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path, } result->abstract_syntax = *abstract_syntax; - result->transfer_syntax = ndr_transfer_syntax; + result->transfer_syntax = ndr_transfer_syntax_ndr; result->desthost = get_myname(result); result->srv_name_slash = talloc_asprintf_strupper_m( @@ -2605,7 +2605,7 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli, } result->abstract_syntax = *abstract_syntax; - result->transfer_syntax = ndr_transfer_syntax; + result->transfer_syntax = ndr_transfer_syntax_ndr; result->desthost = talloc_strdup(result, cli_state_remote_name(cli)); result->srv_name_slash = talloc_asprintf_strupper_m( result, "\\\\%s", result->desthost); diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c index 58f2220264..cb99bde528 100644 --- a/source3/rpc_server/epmapper/srv_epmapper.c +++ b/source3/rpc_server/epmapper/srv_epmapper.c @@ -904,8 +904,8 @@ 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.uuid) || - ifid.if_version != ndr_transfer_syntax.if_version) { + !GUID_equal(&ifid.uuid, &ndr_transfer_syntax_ndr.uuid) || + ifid.if_version != ndr_transfer_syntax_ndr.if_version) { rc = EPMAPPER_STATUS_NO_MORE_ENTRIES; goto done; } diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c index 37c30791b2..f1b7b43b46 100644 --- a/source3/rpc_server/rpc_ncacn_np.c +++ b/source3/rpc_server/rpc_ncacn_np.c @@ -477,7 +477,7 @@ NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, } result->abstract_syntax = *abstract_syntax; - result->transfer_syntax = ndr_transfer_syntax; + result->transfer_syntax = ndr_transfer_syntax_ndr; if (remote_address == NULL) { struct tsocket_address *local; @@ -675,7 +675,7 @@ static NTSTATUS rpc_pipe_open_external(TALLOC_CTX *mem_ctx, } result->abstract_syntax = *abstract_syntax; - result->transfer_syntax = ndr_transfer_syntax; + result->transfer_syntax = ndr_transfer_syntax_ndr; result->desthost = get_myname(result); result->srv_name_slash = talloc_asprintf_strupper_m( diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c index 4330a7ddc3..0bc48b1a06 100644 --- a/source3/rpc_server/srv_pipe.c +++ b/source3/rpc_server/srv_pipe.c @@ -341,7 +341,7 @@ static bool check_bind_req(struct pipes_struct *p, /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */ if (rpc_srv_pipe_exists_by_id(abstract) && - ndr_syntax_id_equal(transfer, &ndr_transfer_syntax)) { + ndr_syntax_id_equal(transfer, &ndr_transfer_syntax_ndr)) { DEBUG(3, ("check_bind_req: %s -> %s rpc service\n", rpc_srv_get_pipe_cli_name(abstract), rpc_srv_get_pipe_srv_name(abstract))); @@ -759,7 +759,7 @@ static bool api_pipe_bind_req(struct pipes_struct *p, /* Rejection reason: abstract syntax not supported */ bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT; bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX; - bind_ack_ctx.syntax = null_ndr_syntax_id; + bind_ack_ctx.syntax = ndr_syntax_id_null; } /* @@ -1107,7 +1107,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, /* Rejection reason: abstract syntax not supported */ bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT; bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX; - bind_ack_ctx.syntax = null_ndr_syntax_id; + bind_ack_ctx.syntax = ndr_syntax_id_null; } /* -- cgit