sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

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

Browse Source 
metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Oct 10 23:23:07 CEST 2011 on sn-devel-104
This commit is contained in:
Stefan Metzmacher 2011-10-10 15:58:24 +02:00
parent af24591a20
commit b787b6e1bd
11 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libcli/cldap/cldap.c
View File

@ -304,7 +304,6 @@ done:
initialise a cldap_sock initialise a cldap_sock
*/ */
NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx, NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
const struct tsocket_address *local_addr, const struct tsocket_address *local_addr,
const struct tsocket_address *remote_addr, const struct tsocket_address *remote_addr,
struct cldap_socket **_cldap) struct cldap_socket **_cldap)

1
libcli/cldap/cldap.h
View File

@ -52,7 +52,6 @@ struct cldap_search {
}; };
NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx, NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
const struct tsocket_address *local_addr, const struct tsocket_address *local_addr,
const struct tsocket_address *remote_addr, const struct tsocket_address *remote_addr,
struct cldap_socket **_cldap); struct cldap_socket **_cldap);

2
source3/libads/cldap.c
View File

@ -59,7 +59,7 @@ bool ads_cldap_netlogon(TALLOC_CTX *mem_ctx,
/* /*
* as we use a connected udp socket * 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); TALLOC_FREE(dest_addr);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
DEBUG(2,("Failed to create cldap socket to %s: %s\n", DEBUG(2,("Failed to create cldap socket to %s: %s\n",

3
source3/nmbd/nmbd_processlogon.c
View File

@ -120,8 +120,7 @@ bool initialize_nmbd_proxy_logon(void)
} }
/* we create a connected udp socket */ /* we create a connected udp socket */
status = cldap_socket_init(ctx, nmbd_event_context(), NULL, status = cldap_socket_init(ctx, NULL, server_addr, &ctx->cldap_sock);
server_addr, &ctx->cldap_sock);
TALLOC_FREE(server_addr); TALLOC_FREE(server_addr);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(ctx); TALLOC_FREE(ctx);

1
source4/cldap_server/cldap_server.c
View File

@ -125,7 +125,6 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_
/* listen for unicasts on the CLDAP port (389) */ /* listen for unicasts on the CLDAP port (389) */
status = cldap_socket_init(cldapd, status = cldap_socket_init(cldapd,
cldapd->task->event_ctx,
socket_address, socket_address,
NULL, NULL,
&cldapsock); &cldapsock);

6
source4/libcli/finddcs_cldap.c
View File

@ -131,7 +131,7 @@ static bool finddcs_cldap_ipaddress(struct finddcs_cldap_state *state, struct fi
} }
state->srv_addresses[1] = NULL; state->srv_addresses[1] = NULL;
state->srv_address_index = 0; 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)) { if (tevent_req_nterror(state->req, status)) {
return false; return false;
} }
@ -307,7 +307,7 @@ static void finddcs_cldap_name_resolved(struct composite_context *ctx)
state->srv_address_index = 0; 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)) { if (tevent_req_nterror(state->req, status)) {
return; return;
} }
@ -338,7 +338,7 @@ static void finddcs_cldap_srv_resolved(struct composite_context *ctx)
state->srv_address_index = 0; 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)) { if (tevent_req_nterror(state->req, status)) {
return; return;
} }

3
source4/libnet/libnet_become_dc.c
View File

@ -773,8 +773,7 @@ static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s)
if (!composite_is_ok(c)) return; if (!composite_is_ok(c)) return;
} }
c->status = cldap_socket_init(s, s->libnet->event_ctx, c->status = cldap_socket_init(s, NULL, dest_address, &s->cldap.sock);
NULL, dest_address, &s->cldap.sock);
if (!composite_is_ok(c)) return; if (!composite_is_ok(c)) return;
req = cldap_netlogon_send(s, s->libnet->event_ctx, req = cldap_netlogon_send(s, s->libnet->event_ctx,

2
source4/libnet/libnet_site.c
View File

@ -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 */ /* 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)) { if (!NT_STATUS_IS_OK(status)) {
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
r->out.error_string = NULL; r->out.error_string = NULL;

3
source4/libnet/libnet_unbecome_dc.c
View File

@ -281,8 +281,7 @@ static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s)
if (!composite_is_ok(c)) return; if (!composite_is_ok(c)) return;
} }
c->status = cldap_socket_init(s, s->libnet->event_ctx, c->status = cldap_socket_init(s, NULL, dest_address, &s->cldap.sock);
NULL, dest_address, &s->cldap.sock);
if (!composite_is_ok(c)) return; if (!composite_is_ok(c)) return;
req = cldap_netlogon_send(s, s->libnet->event_ctx, req = cldap_netlogon_send(s, s->libnet->event_ctx,

8
source4/torture/ldap/cldap.c
View File

@ -54,7 +54,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest)
&dest_addr); &dest_addr);
CHECK_VAL(ret, 0); 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); CHECK_STATUS(status, NT_STATUS_OK);
ZERO_STRUCT(search); ZERO_STRUCT(search);
@ -288,7 +288,7 @@ static bool test_cldap_netlogon_flags(struct torture_context *tctx,
CHECK_VAL(ret, 0); CHECK_VAL(ret, 0);
/* cldap_socket_init should now know about the dest. address */ /* 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); CHECK_STATUS(status, NT_STATUS_OK);
printf("Printing out netlogon server type flags: %s\n", dest); 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); CHECK_VAL(ret, 0);
/* cldap_socket_init should now know about the dest. address */ /* 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); CHECK_STATUS(status, NT_STATUS_OK);
printf("Testing netlogon server type flag NBT_SERVER_FOREST_ROOT: "); 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); CHECK_VAL(ret, 0);
/* cldap_socket_init should now know about the dest. address */ /* 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); CHECK_STATUS(status, NT_STATUS_OK);
ZERO_STRUCT(search); ZERO_STRUCT(search);

4
source4/torture/ldap/cldapbench.c
View File

@ -71,7 +71,7 @@ static bool bench_cldap_netlogon(struct torture_context *tctx, const char *addre
&dest_addr); &dest_addr);
CHECK_VAL(ret, 0); 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"); torture_assert_ntstatus_ok(tctx, status, "cldap_socket_init");
state = talloc_zero(tctx, struct bench_state); 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); CHECK_VAL(ret, 0);
/* cldap_socket_init should now know about the dest. address */ /* 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"); torture_assert_ntstatus_ok(tctx, status, "cldap_socket_init");
state = talloc_zero(tctx, struct bench_state); state = talloc_zero(tctx, struct bench_state);