libcli/cldap: don't pass tevent_context to cldap_socket_init()

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Oct 10 23:23:07 CEST 2011 on sn-devel-104

11 files changed, 14 insertions, 20 deletions

diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 966975d852..219b343d80 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -304,7 +304,6 @@ done:
   initialise a cldap_sock
 */
 NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
-			   struct tevent_context *ev,
 			   const struct tsocket_address *local_addr,
 			   const struct tsocket_address *remote_addr,
 			   struct cldap_socket **_cldap)
diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index 10c92959e0..0bc9454f80 100644
--- a/libcli/cldap/cldap.h
+++ b/libcli/cldap/cldap.h
@@ -52,7 +52,6 @@ struct cldap_search {
 };
 
 NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
-			   struct tevent_context *ev,
 			   const struct tsocket_address *local_addr,
 			   const struct tsocket_address *remote_addr,
 			   struct cldap_socket **_cldap);
diff --git a/source3/libads/cldap.c b/source3/libads/cldap.c
index 03fa17c26f..4f725a093e 100644
--- a/source3/libads/cldap.c
+++ b/source3/libads/cldap.c
@@ -59,7 +59,7 @@ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
 	/*
 	 * as we use a connected udp socket
 	 */
-	status = cldap_socket_init(mem_ctx, NULL, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(mem_ctx, NULL, dest_addr, &cldap);
 	TALLOC_FREE(dest_addr);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(2,("Failed to create cldap socket to %s: %s\n",
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index f00a8d8e16..43ffd726c6 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -120,8 +120,7 @@ bool initialize_nmbd_proxy_logon(void)
 	}
 
 	/* we create a connected udp socket */
-	status = cldap_socket_init(ctx, nmbd_event_context(), NULL,
-				   server_addr, &ctx->cldap_sock);
+	status = cldap_socket_init(ctx, NULL, server_addr, &ctx->cldap_sock);
 	TALLOC_FREE(server_addr);
 	if (!NT_STATUS_IS_OK(status)) {
 		TALLOC_FREE(ctx);
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 111493672d..78712bfecf 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -125,7 +125,6 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_
 
 	/* listen for unicasts on the CLDAP port (389) */
 	status = cldap_socket_init(cldapd,
-				   cldapd->task->event_ctx,
 				   socket_address,
 				   NULL,
 				   &cldapsock);
diff --git a/source4/libcli/finddcs_cldap.c b/source4/libcli/finddcs_cldap.c
index ee5278f051..0643135cae 100644
--- a/source4/libcli/finddcs_cldap.c
+++ b/source4/libcli/finddcs_cldap.c
@@ -131,7 +131,7 @@ static bool finddcs_cldap_ipaddress(struct finddcs_cldap_state *state, struct fi
 	}
 	state->srv_addresses[1] = NULL;
 	state->srv_address_index = 0;
-	status = cldap_socket_init(state, state->ev, NULL, NULL, &state->cldap);
+	status = cldap_socket_init(state, NULL, NULL, &state->cldap);
 	if (tevent_req_nterror(state->req, status)) {
 		return false;
 	}
@@ -307,7 +307,7 @@ static void finddcs_cldap_name_resolved(struct composite_context *ctx)
 
 	state->srv_address_index = 0;
 
-	status = cldap_socket_init(state, state->ev, NULL, NULL, &state->cldap);
+	status = cldap_socket_init(state, NULL, NULL, &state->cldap);
 	if (tevent_req_nterror(state->req, status)) {
 		return;
 	}
@@ -338,7 +338,7 @@ static void finddcs_cldap_srv_resolved(struct composite_context *ctx)
 
 	state->srv_address_index = 0;
 
-	status = cldap_socket_init(state, state->ev, NULL, NULL, &state->cldap);
+	status = cldap_socket_init(state, NULL, NULL, &state->cldap);
 	if (tevent_req_nterror(state->req, status)) {
 		return;
 	}
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 6f70f32903..f0f57d6248 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -773,8 +773,7 @@ static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
 		if (!composite_is_ok(c)) return;
 	}
 
-	c->status = cldap_socket_init(s, s->libnet->event_ctx,
-				      NULL, dest_address, &s->cldap.sock);
+	c->status = cldap_socket_init(s, NULL, dest_address, &s->cldap.sock);
 	if (!composite_is_ok(c)) return;
 
 	req = cldap_netlogon_send(s, s->libnet->event_ctx,
diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c
index a74dd59a22..288e13d59a 100644
--- a/source4/libnet/libnet_site.c
+++ b/source4/libnet/libnet_site.c
@@ -69,7 +69,7 @@ NTSTATUS libnet_FindSite(TALLOC_CTX *ctx, struct libnet_context *lctx, struct li
 	}
 
 	/* we want to use non async calls, so we're not passing an event context */
-	status = cldap_socket_init(tmp_ctx, NULL, NULL, dest_address, &cldap);
+	status = cldap_socket_init(tmp_ctx, NULL, dest_address, &cldap);
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(tmp_ctx);
 		r->out.error_string = NULL;
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index be28907b5b..a46d1433bc 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -281,8 +281,7 @@ static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
 		if (!composite_is_ok(c)) return;
 	}
 
-	c->status = cldap_socket_init(s, s->libnet->event_ctx,
-				      NULL, dest_address, &s->cldap.sock);
+	c->status = cldap_socket_init(s, NULL, dest_address, &s->cldap.sock);
 	if (!composite_is_ok(c)) return;
 
 	req = cldap_netlogon_send(s, s->libnet->event_ctx,
diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index 689e518e77..69ed302ec8 100644
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -54,7 +54,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest)
 						&dest_addr);
 	CHECK_VAL(ret, 0);
 
-	status = cldap_socket_init(tctx, NULL, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
 	ZERO_STRUCT(search);
@@ -288,7 +288,7 @@ static bool test_cldap_netlogon_flags(struct torture_context *tctx,
 	CHECK_VAL(ret, 0);
 
 	/* cldap_socket_init should now know about the dest. address */
-	status = cldap_socket_init(tctx, NULL, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
 	printf("Printing out netlogon server type flags: %s\n", dest);
@@ -408,7 +408,7 @@ static bool test_cldap_netlogon_flag_ds_dns_forest(struct torture_context *tctx,
 	CHECK_VAL(ret, 0);
 
 	/* cldap_socket_init should now know about the dest. address */
-	status = cldap_socket_init(tctx, NULL, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
 	printf("Testing netlogon server type flag NBT_SERVER_FOREST_ROOT: ");
@@ -490,7 +490,7 @@ static bool test_cldap_generic(struct torture_context *tctx, const char *dest)
 	CHECK_VAL(ret, 0);
 
 	/* cldap_socket_init should now know about the dest. address */
-	status = cldap_socket_init(tctx, NULL, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
 	ZERO_STRUCT(search);
diff --git a/source4/torture/ldap/cldapbench.c b/source4/torture/ldap/cldapbench.c
index 9b87ae3138..36b319dec6 100644
--- a/source4/torture/ldap/cldapbench.c
+++ b/source4/torture/ldap/cldapbench.c
@@ -71,7 +71,7 @@ static bool bench_cldap_netlogon(struct torture_context *tctx, const char *addre
 						&dest_addr);
 	CHECK_VAL(ret, 0);
 
-	status = cldap_socket_init(tctx, tctx->ev, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
 	torture_assert_ntstatus_ok(tctx, status, "cldap_socket_init");
 
 	state = talloc_zero(tctx, struct bench_state);
@@ -156,7 +156,7 @@ static bool bench_cldap_rootdse(struct torture_context *tctx, const char *addres
 	CHECK_VAL(ret, 0);
 
 	/* cldap_socket_init should now know about the dest. address */
-	status = cldap_socket_init(tctx, tctx->ev, NULL, dest_addr, &cldap);
+	status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
 	torture_assert_ntstatus_ok(tctx, status, "cldap_socket_init");
 
 	state = talloc_zero(tctx, struct bench_state);