sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00
Code

r8820: Push this common block of code into the caller.

Browse Source 
Use talloc_steal() rather than talloc_reference().

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2005-07-28 04:46:11 +00:00 committed by Gerald (Jerry) Carter
parent 25b7524ce5
commit 8774f971f3
1 changed files with 18 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source/librpc/rpc/dcerpc_util.c
View File

@ -1022,19 +1022,6 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(TALLOC_CTX *tmp_ctx,
return status;
}
/* Look up identifier using the epmapper */
if (!binding->endpoint) {
status = dcerpc_epm_map_binding(tmp_ctx, binding,
pipe_uuid, pipe_version,
p->conn->event_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Failed to map DCERPC/TCP NCACN_NP pipe for '%s' - %s\n",
pipe_uuid, nt_errstr(status)));
return status;
}
DEBUG(2,("Mapped to DCERPC/NP pipe %s\n", binding->endpoint));
}
pipe_name = binding->endpoint;
status = dcerpc_pipe_open_smb(p->conn, cli->tree, pipe_name);
@ -1056,19 +1043,6 @@ static NTSTATUS dcerpc_pipe_connect_ncalrpc(TALLOC_CTX *tmp_ctx,
{
NTSTATUS status;
/* Look up identifier using the epmapper */
if (!binding->endpoint) {
status = dcerpc_epm_map_binding(tmp_ctx, binding,
pipe_uuid, pipe_version,
p->conn->event_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Failed to map DCERPC/TCP NCALRPC identifier for '%s' - %s\n",
pipe_uuid, nt_errstr(status)));
return status;
}
DEBUG(2,("Mapped to DCERPC/LRPC identifier %s\n", binding->endpoint));
}
status = dcerpc_pipe_open_pipe(p->conn, binding->endpoint);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Failed to open ncalrpc pipe '%s' - %s\n",
@ -1118,18 +1092,6 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(TALLOC_CTX *tmp_ctx,
NTSTATUS status;
uint32_t port = 0;
if (!binding->endpoint) {
status = dcerpc_epm_map_binding(tmp_ctx, binding,
pipe_uuid, pipe_version,
p->conn->event_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Failed to map DCERPC/TCP port for '%s' - %s\n",
pipe_uuid, nt_errstr(status)));
return status;
}
DEBUG(2,("Mapped to DCERPC/TCP port %s\n", binding->endpoint));
}
port = atoi(binding->endpoint);
status = dcerpc_pipe_open_tcp(p->conn, binding->host, port);
@ -1166,6 +1128,23 @@ NTSTATUS dcerpc_pipe_connect_b(TALLOC_CTX *parent_ctx,
}
tmp_ctx = talloc_named(p, 0, "dcerpc_pipe_connect_b tmp_ctx");
switch (binding->transport) {
case NCACN_NP:
case NCACN_IP_TCP:
case NCALRPC:
if (!binding->endpoint) {
status = dcerpc_epm_map_binding(tmp_ctx, binding,
pipe_uuid, pipe_version,
p->conn->event_ctx);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Failed to map DCERPC endpoint for '%s' - %s\n",
pipe_uuid, nt_errstr(status)));
return status;
}
DEBUG(2,("Mapped to DCERPC endpoint %s\n", binding->endpoint));
}
}
switch (binding->transport) {
case NCACN_NP:
status = dcerpc_pipe_connect_ncacn_np(tmp_ctx,
@ -1237,7 +1216,7 @@ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx,
credentials, ev);
if (NT_STATUS_IS_OK(status)) {
*pp = talloc_reference(parent_ctx, *pp);
*pp = talloc_steal(parent_ctx, *pp);
}
talloc_free(tmp_ctx);