diff options
author | Samuel Cabrero <scabrero@samba.org> | 2019-10-03 16:40:53 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2019-10-18 16:07:36 +0000 |
commit | b6c8afa98c5c1f9853b09fd83b039aacc79700db (patch) | |
tree | 4cf3b6d5b2c5e93f849c3fbb811a5692ba34b671 /source4 | |
parent | 83def9a945f40892aaf0e4ea6ea7845d74bbaf7c (diff) | |
download | samba-b6c8afa98c5c1f9853b09fd83b039aacc79700db.tar.gz |
s4:librpc: Rename ncacn_push_auth to dcerpc_ncacn_push_auth
Next commit will move this function to common librpc
Signed-off-by: Samuel Cabrero <scabrero@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4')
-rw-r--r-- | source4/librpc/rpc/dcerpc.c | 18 | ||||
-rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 7 | ||||
-rw-r--r-- | source4/rpc_server/dcerpc_server.c | 8 | ||||
-rw-r--r-- | source4/rpc_server/dcesrv_reply.c | 2 |
4 files changed, 22 insertions, 13 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 21ae5bcbd8d..87a99a8df89 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -1041,8 +1041,10 @@ struct tevent_req *dcerpc_bind_send(TALLOC_CTX *mem_ctx, pkt.u.bind.auth_info = data_blob(NULL, 0); /* construct the NDR form of the packet */ - status = ncacn_push_auth(&blob, state, &pkt, - p->conn->security_state.tmp_auth_info.out); + status = dcerpc_ncacn_push_auth(&blob, + state, + &pkt, + p->conn->security_state.tmp_auth_info.out); if (tevent_req_nterror(req, status)) { return tevent_req_post(req, ev); } @@ -1290,8 +1292,10 @@ NTSTATUS dcerpc_auth3(struct dcerpc_pipe *p, } /* construct the NDR form of the packet */ - status = ncacn_push_auth(&blob, mem_ctx, &pkt, - p->conn->security_state.tmp_auth_info.out); + status = dcerpc_ncacn_push_auth(&blob, + mem_ctx, + &pkt, + p->conn->security_state.tmp_auth_info.out); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -2126,8 +2130,10 @@ struct tevent_req *dcerpc_alter_context_send(TALLOC_CTX *mem_ctx, pkt.u.alter.auth_info = data_blob(NULL, 0); /* construct the NDR form of the packet */ - status = ncacn_push_auth(&blob, state, &pkt, - p->conn->security_state.tmp_auth_info.out); + status = dcerpc_ncacn_push_auth(&blob, + state, + &pkt, + p->conn->security_state.tmp_auth_info.out); if (tevent_req_nterror(req, status)) { return tevent_req_post(req, ev); } diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index 294ccfc1743..f2db5875af3 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -52,9 +52,10 @@ const struct ndr_interface_call *dcerpc_iface_find_call(const struct ndr_interfa /* push a ncacn_packet into a blob, potentially with auth info */ -NTSTATUS ncacn_push_auth(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, - struct ncacn_packet *pkt, - struct dcerpc_auth *auth_info) +NTSTATUS dcerpc_ncacn_push_auth(DATA_BLOB *blob, + TALLOC_CTX *mem_ctx, + struct ncacn_packet *pkt, + struct dcerpc_auth *auth_info) { struct ndr_push *ndr; enum ndr_err_code ndr_err; diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index c16d76e0436..e879cba82f8 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -762,7 +762,7 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason) return NT_STATUS_NO_MEMORY; } - status = ncacn_push_auth(&rep->blob, call, &pkt, NULL); + status = dcerpc_ncacn_push_auth(&rep->blob, call, &pkt, NULL); if (!NT_STATUS_IS_OK(status)) { return status; } @@ -1287,8 +1287,10 @@ static NTSTATUS dcesrv_auth_reply(struct dcesrv_call_state *call) return NT_STATUS_NO_MEMORY; } - status = ncacn_push_auth(&rep->blob, call, pkt, - call->out_auth_info); + status = dcerpc_ncacn_push_auth(&rep->blob, + call, + pkt, + call->out_auth_info); if (!NT_STATUS_IS_OK(status)) { return status; } diff --git a/source4/rpc_server/dcesrv_reply.c b/source4/rpc_server/dcesrv_reply.c index 68e0bd9e518..33f2e51db90 100644 --- a/source4/rpc_server/dcesrv_reply.c +++ b/source4/rpc_server/dcesrv_reply.c @@ -116,7 +116,7 @@ NTSTATUS dcesrv_fault_with_flags(struct dcesrv_call_state *call, return NT_STATUS_NO_MEMORY; } - status = ncacn_push_auth(&rep->blob, call, &pkt, NULL); + status = dcerpc_ncacn_push_auth(&rep->blob, call, &pkt, NULL); if (!NT_STATUS_IS_OK(status)) { return status; } |