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/libcli/wrepl | |
| parent | 274d07ddff5c5920b9a2f3674e9104d8aab9e90c (diff) | |
| download | samba-f055893ca571fbeac3675c02344c7cc53106bea1.tar.gz samba-f055893ca571fbeac3675c02344c7cc53106bea1.tar.bz2 samba-f055893ca571fbeac3675c02344c7cc53106bea1.zip | |
r26382: Remove more uses of global_loadparm.
(This used to be commit 6d4c59853481855c232e7cf97264a391f40af2b5)
Diffstat (limited to 'source4/libcli/wrepl')
| -rw-r--r-- | source4/libcli/wrepl/winsrepl.c | 8 | ||||
| -rw-r--r-- | source4/libcli/wrepl/winsrepl.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 00346c45a4..92543be487 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -313,6 +313,7 @@ static void wrepl_connect_handler(struct composite_context *creq) connect a wrepl_socket to a WINS server */ struct composite_context *wrepl_connect_send(struct wrepl_socket *wrepl_socket, + struct resolve_context *resolve_ctx, const char *our_ip, const char *peer_ip) { struct composite_context *result; @@ -344,7 +345,7 @@ struct composite_context *wrepl_connect_send(struct wrepl_socket *wrepl_socket, if (composite_nomem(peer, result)) return result; state->creq = socket_connect_send(wrepl_socket->sock, us, peer, - 0, lp_resolve_context(global_loadparm), + 0, resolve_ctx, wrepl_socket->event.ctx); composite_continue(result, state->creq, wrepl_connect_handler, state); return result; @@ -371,9 +372,10 @@ NTSTATUS wrepl_connect_recv(struct composite_context *result) /* connect a wrepl_socket to a WINS server - sync API */ -NTSTATUS wrepl_connect(struct wrepl_socket *wrepl_socket, const char *our_ip, const char *peer_ip) +NTSTATUS wrepl_connect(struct wrepl_socket *wrepl_socket, struct resolve_context *resolve_ctx, + const char *our_ip, const char *peer_ip) { - struct composite_context *c_req = wrepl_connect_send(wrepl_socket, our_ip, peer_ip); + struct composite_context *c_req = wrepl_connect_send(wrepl_socket, resolve_ctx, our_ip, peer_ip); return wrepl_connect_recv(c_req); } diff --git a/source4/libcli/wrepl/winsrepl.h b/source4/libcli/wrepl/winsrepl.h index 8ce8b418a2..52b0bee69e 100644 --- a/source4/libcli/wrepl/winsrepl.h +++ b/source4/libcli/wrepl/winsrepl.h @@ -154,4 +154,6 @@ struct wrepl_pull_names { } out; }; +struct resolve_context; + #include "libcli/wrepl/winsrepl_proto.h" |