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

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>

diff --git a/source3/lib/server_contexts.c b/source3/lib/server_contexts.c
index d49e33402fa6c55bd97f63d322837af43f043912..50072e680b6b3dbe0da95f9570d02d0e98470aea 100644 (file)
--- a/source3/lib/server_contexts.c
+++ b/source3/lib/server_contexts.c
@@ -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");

diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
index f9c73de81e5c2879203d03965b77f26bc767bead..083cbbeb4540cb39d256126813b7bad74fb13d50 100644 (file)
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -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;
        }
 

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index e3c32f945f7d62df084c533bee82258b08939bd5..8f097ecbc00a87d450336252b9afa31362f3e8c9 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -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;
        }

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index f1e64aca98ed2e3ba1f41b6d2c7c68ec114e9412..3cbd08971fe0ce2316a5c498981bafe3e97aa24e 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -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) {