diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-07 16:04:17 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:46 +0100 |
| commit | 01d2acfdb4c4c0349a28a18c5c0da5b960b02791 (patch) | |
| tree | 7a8ae7ae55fa531212d67275f8ebfb8e9c74a205 /source4/libcli | |
| parent | 0b4fab2f6047f03221314f82229647d6662464e0 (diff) | |
| download | samba-01d2acfdb4c4c0349a28a18c5c0da5b960b02791.tar.gz samba-01d2acfdb4c4c0349a28a18c5c0da5b960b02791.tar.bz2 samba-01d2acfdb4c4c0349a28a18c5c0da5b960b02791.zip | |
r26335: Specify name_resolve_order to socket code.
(This used to be commit b03e5d00110be3f1fe5809dad4eb6ca5cea7463d)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/ldap/ldap_client.c | 4 | ||||
| -rw-r--r-- | source4/libcli/raw/clisocket.c | 1 | ||||
| -rw-r--r-- | source4/libcli/wrepl/winsrepl.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index 2fe0c78555..c859b4a4d1 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -352,7 +352,7 @@ struct composite_context *ldap_connect_send(struct ldap_connection *conn, } ctx = socket_connect_send(conn->sock, NULL, unix_addr, - 0, conn->event.event_ctx); + 0, lp_name_resolve_order(global_loadparm), conn->event.event_ctx); ctx->async.fn = ldap_connect_recv_unix_conn; ctx->async.private_data = state; return result; @@ -365,7 +365,7 @@ struct composite_context *ldap_connect_send(struct ldap_connection *conn, } ctx = socket_connect_multi_send(state, conn->host, 1, &conn->port, - conn->event.event_ctx); + lp_name_resolve_order(global_loadparm), conn->event.event_ctx); if (ctx == NULL) goto failed; ctx->async.fn = ldap_connect_recv_tcp_conn; diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c index 6e12d8073d..9b744dcc18 100644 --- a/source4/libcli/raw/clisocket.c +++ b/source4/libcli/raw/clisocket.c @@ -96,6 +96,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx, ctx = socket_connect_multi_send(state, host_addr, state->num_ports, state->ports, + lp_name_resolve_order(global_loadparm), state->ctx->event_ctx); if (ctx == NULL) goto failed; ctx->async.fn = smbcli_sock_connect_recv_conn; diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c index 8f808198eb..9f7bd91ec9 100644 --- a/source4/libcli/wrepl/winsrepl.c +++ b/source4/libcli/wrepl/winsrepl.c @@ -343,7 +343,8 @@ 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, wrepl_socket->event.ctx); + 0, lp_name_resolve_order(global_loadparm), + wrepl_socket->event.ctx); composite_continue(result, state->creq, wrepl_connect_handler, state); return result; } |