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

s3: server: s3_tevent_context_init() -> samba_tevent_context_init()

Browse Source 
We can now remove source3/lib/events.c

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12283
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Jeremy Allison 2016-09-23 19:11:17 -07:00 committed by Volker Lendecke
parent 72785309aa
commit fbfea52e1c
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/server_contexts.c
View File

@ -31,7 +31,7 @@ struct tevent_context *server_event_context(void)
* autofree context, to avoid side effects in forked
* children exiting.
*/
server_event_ctx = s3_tevent_context_init(NULL);
server_event_ctx = samba_tevent_context_init(NULL);
}
if (!server_event_ctx) {
smb_panic("Could not init server's event context");

8
source3/rpc_server/rpc_ncacn_np.c
View File

@ -708,9 +708,9 @@ NTSTATUS make_external_rpc_pipe(TALLOC_CTX *mem_ctx,
goto out;
}
ev_ctx = s3_tevent_context_init(tmp_ctx);
ev_ctx = samba_tevent_context_init(tmp_ctx);
if (ev_ctx == NULL) {
DEBUG(0, ("s3_tevent_context_init failed\n"));
DEBUG(0, ("samba_tevent_context_init failed\n"));
status = NT_STATUS_NO_MEMORY;
goto out;
}
@ -816,9 +816,9 @@ struct np_proxy_state *make_external_rpc_pipe_p(TALLOC_CTX *mem_ctx,
goto fail;
}
ev = s3_tevent_context_init(talloc_tos());
ev = samba_tevent_context_init(talloc_tos());
if (ev == NULL) {
DEBUG(0, ("s3_tevent_context_init failed\n"));
DEBUG(0, ("samba_tevent_context_init failed\n"));
goto fail;
}

4
source3/smbd/process.c
View File

@ -3224,9 +3224,9 @@ static void smbd_echo_loop(struct smbXsrv_connection *xconn,
}
state->xconn = xconn;
state->parent_pipe = parent_pipe;
state->ev = s3_tevent_context_init(state);
state->ev = samba_tevent_context_init(state);
if (state->ev == NULL) {
DEBUG(1, ("tevent_context_init failed\n"));
DEBUG(1, ("samba_tevent_context_init failed\n"));
TALLOC_FREE(state);
return;
}

1
source3/smbd/server.c
View File

@ -1670,7 +1670,6 @@ extern void build_options(bool screen);
* Initialize the event context. The event context needs to be
* initialized before the messaging context, cause the messaging
* context holds an event context.
* FIXME: This should be s3_tevent_context_init()
*/
ev_ctx = server_event_context();
if (ev_ctx == NULL) {