diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 18:41:55 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:17 +0100 |
| commit | f055893ca571fbeac3675c02344c7cc53106bea1 (patch) | |
| tree | 1dfa4dc151018102d18a219b9a6e20c1c78ae913 /source4/wrepl_server | |
| parent | 274d07ddff5c5920b9a2f3674e9104d8aab9e90c (diff) | |
| download | samba-f055893ca571fbeac3675c02344c7cc53106bea1.tar.gz samba-f055893ca571fbeac3675c02344c7cc53106bea1.tar.xz samba-f055893ca571fbeac3675c02344c7cc53106bea1.zip | |
r26382: Remove more uses of global_loadparm.
(This used to be commit 6d4c59853481855c232e7cf97264a391f40af2b5)
Diffstat (limited to 'source4/wrepl_server')
| -rw-r--r-- | source4/wrepl_server/wrepl_out_helpers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/wrepl_server/wrepl_out_helpers.c b/source4/wrepl_server/wrepl_out_helpers.c index 2599ef4d098..f809095f223 100644 --- a/source4/wrepl_server/wrepl_out_helpers.c +++ b/source4/wrepl_server/wrepl_out_helpers.c @@ -29,6 +29,7 @@ #include "nbt_server/wins/winsdb.h" #include "libcli/composite/composite.h" #include "libcli/wrepl/winsrepl.h" +#include "libcli/resolve/resolve.h" enum wreplsrv_out_connect_stage { WREPLSRV_OUT_CONNECT_STAGE_WAIT_SOCKET, @@ -191,6 +192,7 @@ static struct composite_context *wreplsrv_out_connect_send(struct wreplsrv_partn state->stage = WREPLSRV_OUT_CONNECT_STAGE_WAIT_SOCKET; state->wreplconn= wreplconn; state->c_req = wrepl_connect_send(wreplconn->sock, + lp_resolve_context(service->task->lp_ctx), partner->our_address, partner->address); if (!state->c_req) goto failed; @@ -379,8 +381,7 @@ static NTSTATUS wreplsrv_pull_table_recv(struct composite_context *c, TALLOC_CTX struct wreplsrv_pull_table_state *state = talloc_get_type(c->private_data, struct wreplsrv_pull_table_state); io->out.num_owners = state->table_io.out.num_partners; - io->out.owners = state->table_io.out.partners; - talloc_reference(mem_ctx, state->table_io.out.partners); + io->out.owners = talloc_reference(mem_ctx, state->table_io.out.partners); } talloc_free(c); @@ -535,8 +536,7 @@ static NTSTATUS wreplsrv_pull_names_recv(struct composite_context *c, TALLOC_CTX struct wreplsrv_pull_names_state *state = talloc_get_type(c->private_data, struct wreplsrv_pull_names_state); io->out.num_names = state->pull_io.out.num_names; - io->out.names = state->pull_io.out.names; - talloc_reference(mem_ctx, state->pull_io.out.names); + io->out.names = talloc_reference(mem_ctx, state->pull_io.out.names); } talloc_free(c); |