From: Jeremy Allison <jra@samba.org>
Date: Sat, 24 Sep 2016 02:11:17 +0000 (-0700)
Subject: s3: server: s3_tevent_context_init() -> samba_tevent_context_init()
X-Git-Tag: samba-4.3.12~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51cad545d02718710cc4f34de98f323938b2e1af;p=thirdparty%2Fsamba.git

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>
(cherry picked from commit fbfea52e1ce8f22d8d020a2bf3aebd1bc69faceb)
---

diff --git a/source3/lib/server_contexts.c b/source3/lib/server_contexts.c
index d49e33402fa..50072e680b6 100644
--- 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 5647596f559..9af8761a948 100644
--- a/source3/rpc_server/rpc_ncacn_np.c
+++ b/source3/rpc_server/rpc_ncacn_np.c
@@ -709,9 +709,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;
 	}
@@ -817,9 +817,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 6c8a31c594e..e6e3d6ee3f8 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3141,9 +3141,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 bc4b37fa805..ecd4a833267 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1295,7 +1295,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) {