sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r12090: use the _trigger_error() function in the function

Browse Source 
that allocated the composite_context

metze
(This used to be commit 998a7f8572bb90b5d478f03f09fba9867a6d8bfa)
This commit is contained in:
Stefan Metzmacher 2005-12-06 11:52:16 +00:00 committed by Gerald (Jerry) Carter
parent b38783f40a
commit 3adb3013b1
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source4/librpc/rpc/dcerpc_connect.c
View File

@ -52,7 +52,6 @@ void continue_pipe_open_smb(struct composite_context *ctx)
c->status = dcerpc_pipe_open_smb_recv(ctx);
if (!NT_STATUS_IS_OK(c->status)) {
DEBUG(0,("Failed to open pipe %s - %s\n", s->io.pipe_name, nt_errstr(c->status)));
composite_error(c, c->status);
return;
@ -72,7 +71,6 @@ void continue_smb_connect(struct composite_context *ctx)
c->status = smb_composite_connect_recv(ctx, c);
if (!NT_STATUS_IS_OK(c->status)) {
DEBUG(0,("Failed to connect to %s - %s\n", s->io.binding->host, nt_errstr(c->status)));
composite_error(c, c->status);
return;
@ -82,10 +80,6 @@ void continue_smb_connect(struct composite_context *ctx)
s->io.pipe_name = s->io.binding->endpoint;
open_ctx = dcerpc_pipe_open_smb_send(s->io.pipe->conn, s->tree, s->io.pipe_name);
if (open_ctx == NULL) {
composite_error(c, NT_STATUS_NO_MEMORY);
return;
}
composite_continue(c, open_ctx, continue_pipe_open_smb, c);
}
@ -104,22 +98,26 @@ struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CTX *tmp_
c = talloc_zero(tmp_ctx, struct composite_context);
if (c == NULL) return NULL;
s = talloc_zero(c, struct pipe_np_smb_state);
if (s == NULL) {
composite_error(c, NT_STATUS_NO_MEMORY);
goto done;
}
c->state = COMPOSITE_STATE_IN_PROGRESS;
c->private_data = s;
c->event_ctx = io->pipe->conn->event_ctx;
s = talloc_zero(c, struct pipe_np_smb_state);
if (s == NULL) {
c->status = NT_STATUS_NO_MEMORY;
goto failed;
}
s->io = *io;
conn = &s->conn;
conn->in.dest_host = s->io.binding->host;
conn->in.port = 0;
conn->in.called_name = strupper_talloc(tmp_ctx, s->io.binding->host);
if (conn->in.called_name) {
c->status = NT_STATUS_NO_MEMORY;
goto failed;
}
conn->in.service = "IPC$";
conn->in.service_type = NULL;
conn->in.fallback_to_anonymous = False;
@ -130,28 +128,28 @@ struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CTX *tmp_
anon_creds = cli_credentials_init(tmp_ctx);
if (!anon_creds) {
composite_error(c, NT_STATUS_NO_MEMORY);
goto done;
c->status = NT_STATUS_NO_MEMORY;
goto failed;
}
cli_credentials_set_anonymous(anon_creds);
cli_credentials_guess(anon_creds);
s->conn.in.credentials = anon_creds;
} else {
s->conn.in.credentials = s->io.creds;
}
conn_req = smb_composite_connect_send(conn, s->io.pipe->conn, s->io.pipe->conn->event_ctx);
if (!conn_req) {
composite_error(c, NT_STATUS_NO_MEMORY);
goto done;
c->status = NT_STATUS_NO_MEMORY;
goto failed;
}
composite_continue(c, conn_req, continue_smb_connect, c);
done:
return c;
failed:
composite_trigger_error(c);
return c;
}