r26335: Specify name_resolve_order to socket code.

diff --git a/source/auth/kerberos/krb5_init_context.c b/source/auth/kerberos/krb5_init_context.c
index 9bcf8910d5b2e242b205ddf249a48f7d64090be6..e3479b12d190d1a836b66dd5e3f2535221119599 100644 (file)
--- a/source/auth/kerberos/krb5_init_context.c
+++ b/source/auth/kerberos/krb5_init_context.c
@@ -276,7 +276,8 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
                        continue;
                }
 
-               status = socket_connect_ev(smb_krb5->sock, NULL, remote_addr, 0, ev); 
+               status = socket_connect_ev(smb_krb5->sock, NULL, remote_addr, 0, 
+                                          lp_name_resolve_order(global_loadparm), ev); 
                if (!NT_STATUS_IS_OK(status)) {
                        talloc_free(smb_krb5);
                        continue;

diff --git a/source/lib/socket/connect.c b/source/lib/socket/connect.c
index 4a30fa3b92c7b433dea4af603df95f0a7df65bb2..cad8967dabf47e10026a0b109bde39f9f5112430 100644 (file)
--- a/source/lib/socket/connect.c
+++ b/source/lib/socket/connect.c
@@ -85,6 +85,7 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
                                              struct socket_address *my_address,
                                              struct socket_address *server_address, 
                                              uint32_t flags,
+                                             const char **name_resolve_order,
                                              struct event_context *event_ctx)
 {
        struct composite_context *result;
@@ -206,10 +207,11 @@ NTSTATUS socket_connect_recv(struct composite_context *result)
 NTSTATUS socket_connect_ev(struct socket_context *sock,
                           struct socket_address *my_address,
                           struct socket_address *server_address, 
-                          uint32_t flags, struct event_context *ev)
+                          uint32_t flags, const char **name_resolve_order,
+                          struct event_context *ev)
 {
        struct composite_context *ctx;
        ctx = socket_connect_send(sock, my_address, 
-                                 server_address, flags, ev);
+                                 server_address, flags, name_resolve_order, ev);
        return socket_connect_recv(ctx);
 }

diff --git a/source/lib/socket/connect_multi.c b/source/lib/socket/connect_multi.c
index 6d301414590e0391b7c709c46d3b43af6b2c7d62..58ab673965395af95f45a68d6361b9e783cb2abd 100644 (file)
--- a/source/lib/socket/connect_multi.c
+++ b/source/lib/socket/connect_multi.c
@@ -38,6 +38,8 @@ struct connect_multi_state {
        int num_ports;
        uint16_t *ports;
 
+       const char **name_resolve_order;
+
        struct socket_context *sock;
        uint16_t result_port;
 
@@ -68,6 +70,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send(
                                                    const char *server_address,
                                                    int num_server_ports,
                                                    uint16_t *server_ports,
+                                                   const char **name_resolve_order,
                                                    struct event_context *event_ctx)
 {
        struct composite_context *result;
@@ -87,6 +90,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send(
        if (composite_nomem(multi->server_address, result)) goto failed;
 
        multi->num_ports = num_server_ports;
+       multi->name_resolve_order = str_list_copy(multi, name_resolve_order);
        multi->ports = talloc_array(multi, uint16_t, multi->num_ports);
        if (composite_nomem(multi->ports, result)) goto failed;
 
@@ -104,7 +108,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send(
                struct composite_context *creq;
                make_nbt_name_client(&name, server_address);
                creq = resolve_name_send(&name, result->event_ctx,
-                                        lp_name_resolve_order(global_loadparm));
+                                        name_resolve_order);
                if (composite_nomem(creq, result)) goto failed;
                composite_continue(result, creq, continue_resolve_name, result);
                return result;
@@ -157,7 +161,8 @@ static void connect_multi_next_socket(struct composite_context *result)
        talloc_steal(state, state->sock);
 
        creq = socket_connect_send(state->sock, NULL, 
-                                  state->addr, 0, result->event_ctx);
+                                  state->addr, 0, multi->name_resolve_order, 
+                                  result->event_ctx);
        if (composite_nomem(creq, result)) return;
        talloc_steal(state, creq);
 
@@ -264,6 +269,7 @@ _PUBLIC_ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
 NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx,
                              const char *server_address,
                              int num_server_ports, uint16_t *server_ports,
+                             const char **name_resolve_order,
                              struct event_context *event_ctx,
                              struct socket_context **result,
                              uint16_t *result_port)
@@ -271,6 +277,7 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx,
        struct composite_context *ctx =
                socket_connect_multi_send(mem_ctx, server_address,
                                          num_server_ports, server_ports,
+                                         name_resolve_order,
                                          event_ctx);
        return socket_connect_multi_recv(ctx, mem_ctx, result, result_port);
 }

diff --git a/source/lib/socket/socket.h b/source/lib/socket/socket.h
index 7679db08a1ceed8137b95892f8532822f732bcbc..24bc5f1aacdcb02a430b68b4e1b8f4592f26fa3b 100644 (file)
--- a/source/lib/socket/socket.h
+++ b/source/lib/socket/socket.h
@@ -178,17 +178,21 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
                                              struct socket_address *my_address,
                                              struct socket_address *server_address, 
                                              uint32_t flags,
+                                             const char **name_resolve_order,
                                              struct event_context *event_ctx);
 NTSTATUS socket_connect_recv(struct composite_context *ctx);
 NTSTATUS socket_connect_ev(struct socket_context *sock,
                           struct socket_address *my_address,
                           struct socket_address *server_address, 
-                          uint32_t flags, struct event_context *ev);
+                          uint32_t flags, 
+                          const char **name_resolve_order,
+                          struct event_context *ev);
 
 struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
                                                    const char *server_address,
                                                    int num_server_ports,
                                                    uint16_t *server_ports,
+                                                   const char **name_resolve_order,
                                                    struct event_context *event_ctx);
 NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
                                   TALLOC_CTX *mem_ctx,
@@ -196,6 +200,7 @@ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
                                   uint16_t *port);
 NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
                              int num_server_ports, uint16_t *server_ports,
+                             const char **name_resolve_order,
                              struct event_context *event_ctx,
                              struct socket_context **result,
                              uint16_t *port);

diff --git a/source/lib/socket/testsuite.c b/source/lib/socket/testsuite.c
index 84132c62b8a01fedfa05de27d6a77888b70e970f..dea740dbc80e8d83de18b77a70e1d8b331e99d4c 100644 (file)
--- a/source/lib/socket/testsuite.c
+++ b/source/lib/socket/testsuite.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "torture/torture.h"
+#include "param/param.h"
 
 /*
   basic testing of udp routines
@@ -145,7 +146,7 @@ static bool test_tcp(struct torture_context *tctx)
 
        torture_comment(tctx, "server port is %d\n", srv_addr->port);
 
-       status = socket_connect_ev(sock2, NULL, srv_addr, 0, ev);
+       status = socket_connect_ev(sock2, NULL, srv_addr, 0, lp_name_resolve_order(tctx->lp_ctx), ev);
        torture_assert_ntstatus_ok(tctx, status, "connect() on socket 2");
 
        status = socket_accept(sock1, &sock3);

diff --git a/source/libcli/ldap/ldap_client.c b/source/libcli/ldap/ldap_client.c
index 2fe0c785558a4f6964e8e538dc3624d5271a687d..c859b4a4d198e0da6fd3db4a8fdf5e57b9d10647 100644 (file)
--- a/source/libcli/ldap/ldap_client.c
+++ b/source/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/source/libcli/raw/clisocket.c b/source/libcli/raw/clisocket.c
index 6e12d8073d1f29c975b6d2419d451d20a64c2d1f..9b744dcc188b25780b59f13059c0c4b2f66929dd 100644 (file)
--- a/source/libcli/raw/clisocket.c
+++ b/source/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/source/libcli/wrepl/winsrepl.c b/source/libcli/wrepl/winsrepl.c
index 8f808198ebc3d438054c53667474fe0b17d1b7c5..9f7bd91ec98d9fb62fec5988cda89179afe7f1bc 100644 (file)
--- a/source/libcli/wrepl/winsrepl.c
+++ b/source/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;
 }

diff --git a/source/librpc/rpc/dcerpc_sock.c b/source/librpc/rpc/dcerpc_sock.c
index 8717a13467efddd416e4ba85d8bb4e671893311a..327b1bf4191f049f3d8de689c5396f9f60510245 100644 (file)
--- a/source/librpc/rpc/dcerpc_sock.c
+++ b/source/librpc/rpc/dcerpc_sock.c
@@ -332,7 +332,8 @@ static struct composite_context *dcerpc_pipe_open_socket_send(TALLOC_CTX *mem_ct
 
        talloc_steal(s->sock, s->socket_ctx);
 
-       conn_req = socket_connect_send(s->socket_ctx, NULL, s->server, 0, c->event_ctx);
+       conn_req = socket_connect_send(s->socket_ctx, NULL, s->server, 0, lp_name_resolve_order(global_loadparm), 
+                                      c->event_ctx);
        composite_continue(c, conn_req, continue_socket_connect, c);
        return c;
 }

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 9cd3cdbdc842717baecc89146de97c9eae7719ed..cafb6dd909e4fc48355efa6b73c8b689a250d3f8 100644 (file)
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -71,7 +71,7 @@ static bool bLoaded = false;
 static bool do_parameter(const char *, const char *, void *);
 static bool defaults_saved = false;
 
-/* 
+/**
  * This structure describes global (ie., server-wide) parameters.
  */
 struct loadparm_global
@@ -180,7 +180,7 @@ struct loadparm_global
 };
 
 
-/* 
+/**
  * This structure describes a single service. 
  */
 struct loadparm_service