Changeset 740 for vendor/current/source4/libcli/resolve

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/libcli/resolve

Files:

• bcast.c (modified) (1 diff)
• dns_ex.c (modified) (6 diffs)
• file.c (added)
• nbtlist.c (modified) (1 diff)
• resolve.c (modified) (7 diffs)
• resolve_lp.c (modified) (2 diffs)
• testsuite.c (modified) (2 diffs)
• wins.c (modified) (1 diff)

vendor/current/source4/libcli/resolve/bcast.c

@@ -102 +102 @@
 {
         struct interface *ifaces;
-        load_interfaces(ctx, lp_interfaces(lp_ctx), &ifaces);
-        return resolve_context_add_bcast_method(ctx, ifaces, lp_nbt_port(lp_ctx), lp_parm_int(lp_ctx, NULL, "nbt", "timeout", 1));
+        load_interfaces(ctx, lpcfg_interfaces(lp_ctx), &ifaces);
+        return resolve_context_add_bcast_method(ctx, ifaces, lpcfg_nbt_port(lp_ctx), lpcfg_parm_int(lp_ctx, NULL, "nbt", "timeout", 1));
 }

vendor/current/source4/libcli/resolve/dns_ex.c

@@ -68 +68 @@
 
         kill(state->child, SIGTERM);
-        close(state->child_fd);
         if (waitpid(state->child, &status, WNOHANG) == 0) {
                 kill(state->child, SIGKILL);
@@ -94 +93 @@
         bool do_srv = (state->flags & RESOLVE_NAME_FLAG_DNS_SRV);
 
+        if (strchr(state->name.name, '.') && state->name.name[strlen(state->name.name)-1] != '.') {
+                /* we are asking for a fully qualified name, but the
+                   name doesn't end in a '.'. We need to prevent the
+                   DNS library trying the search domains configured in
+                   resolv.conf */
+                state->name.name = talloc_strdup_append(discard_const_p(char, state->name.name),
+                                                        ".");
+        }
+
         /* this is the blocking call we are going to lots of trouble
            to avoid in the parent */
@@ -169 +177 @@
                 if (do_srv) {
                         /* we are only interested in SRV records */
-                        if (rr->type != rk_ns_c_in) {
+                        if (rr->type != rk_ns_t_srv) {
                                 continue;
                         }
@@ -209 +217 @@
                         }
 
-                        /* we are only interested in SRV records */
+                        /* we are only interested in A records */
                         if (rr->type != rk_ns_t_a) {
                                 continue;
@@ -370 +378 @@
                 ret = -1;
         }
-        close(state->child_fd);
         if (waitpid(state->child, &status, WNOHANG) == 0) {
                 kill(state->child, SIGKILL);
@@ -499 +506 @@
                 return c;
         }
+        tevent_fd_set_auto_close(state->fde);
 
         state->child = fork();

vendor/current/source4/libcli/resolve/nbtlist.c

@@ -164 +164 @@
         }
 
-        state->nbtsock = nbt_name_socket_init(state, event_ctx, 
-                                              global_iconv_convenience);
+        state->nbtsock = nbt_name_socket_init(state, event_ctx);
         if (composite_nomem(state->nbtsock, c)) return c;
 

vendor/current/source4/libcli/resolve/resolve.c

@@ -28 +28 @@
 #include "lib/socket/socket.h"
 #include "../lib/util/dlinklist.h"
+#include "lib/tsocket/tsocket.h"
+#include "lib/util/util_net.h"
 
 struct resolve_state {
@@ -138 +140 @@
 struct composite_context *resolve_name_all_send(struct resolve_context *ctx,
                                                 TALLOC_CTX *mem_ctx,
-                                                uint32_t flags,
+                                                uint32_t flags, /* RESOLVE_NAME_FLAG_* */
                                                 uint16_t port,
                                                 struct nbt_name *name,
@@ -146 +148 @@
         struct resolve_state *state;
 
-        if (ctx == NULL || event_ctx == NULL) {
+        if (event_ctx == NULL) {
                 return NULL;
         }
@@ -222 +224 @@
 }
 
+struct composite_context *resolve_name_ex_send(struct resolve_context *ctx,
+                                               TALLOC_CTX *mem_ctx,
+                                               uint32_t flags, /* RESOLVE_NAME_FLAG_* */
+                                               uint16_t port,
+                                               struct nbt_name *name,
+                                               struct tevent_context *event_ctx)
+{
+        return resolve_name_all_send(ctx, mem_ctx, flags, port, name, event_ctx);
+}
+
 struct composite_context *resolve_name_send(struct resolve_context *ctx,
                                             TALLOC_CTX *mem_ctx,
@@ -227 +239 @@
                                             struct tevent_context *event_ctx)
 {
-        return resolve_name_all_send(ctx, mem_ctx, 0, 0, name, event_ctx);
+        return resolve_name_ex_send(ctx, mem_ctx, 0, 0, name, event_ctx);
 }
 
@@ -240 +252 @@
 
         if (NT_STATUS_IS_OK(status)) {
-                *reply_addr = talloc_steal(mem_ctx, addrs[0]->addr);
+                struct tsocket_address *t_addr = socket_address_to_tsocket_address(addrs, addrs[0]);
+                if (!t_addr) {
+                        return NT_STATUS_NO_MEMORY;
+                }
+
+                *reply_addr = tsocket_address_inet_addr_string(t_addr, mem_ctx);
                 talloc_free(addrs);
+                if (!*reply_addr) {
+                        return NT_STATUS_NO_MEMORY;
+                }
         }
 
@@ -248 +268 @@
 
 /*
+  receive multiple responses from resolve_name_send()
+ */
+NTSTATUS resolve_name_multiple_recv(struct composite_context *c,
+                                    TALLOC_CTX *mem_ctx,
+                                    const char ***reply_addrs)
+{
+        NTSTATUS status;
+        struct socket_address **addrs = NULL;
+        int i;
+
+        status = resolve_name_all_recv(c, mem_ctx, &addrs, NULL);
+        NT_STATUS_NOT_OK_RETURN(status);
+
+        /* count the addresses */
+        for (i=0; addrs[i]; i++) ;
+
+        *reply_addrs = talloc_array(mem_ctx, const char *, i+1);
+        NT_STATUS_HAVE_NO_MEMORY(*reply_addrs);
+
+        for (i=0; addrs[i]; i++) {
+                struct tsocket_address *t_addr = socket_address_to_tsocket_address(addrs, addrs[i]);
+                NT_STATUS_HAVE_NO_MEMORY(t_addr);
+
+                (*reply_addrs)[i] = tsocket_address_inet_addr_string(t_addr, *reply_addrs);
+                NT_STATUS_HAVE_NO_MEMORY((*reply_addrs)[i]);
+        }
+        (*reply_addrs)[i] = NULL;
+
+        talloc_free(addrs);
+
+        return status;
+}
+
+/*
   general name resolution - sync call
  */
+NTSTATUS resolve_name_ex(struct resolve_context *ctx,
+                         uint32_t flags, /* RESOLVE_NAME_FLAG_* */
+                         uint16_t port,
+                         struct nbt_name *name,
+                         TALLOC_CTX *mem_ctx,
+                         const char **reply_addr,
+                         struct tevent_context *ev)
+{
+        struct composite_context *c = resolve_name_ex_send(ctx, mem_ctx, flags, port, name, ev);
+        return resolve_name_recv(c, mem_ctx, reply_addr);
+}
+
+
+/*
+  general name resolution - sync call
+ */
 NTSTATUS resolve_name(struct resolve_context *ctx,
-                          struct nbt_name *name,
-                          TALLOC_CTX *mem_ctx,
-                          const char **reply_addr,
-                          struct tevent_context *ev)
-{
-        struct composite_context *c = resolve_name_send(ctx, mem_ctx, name, ev);
-        return resolve_name_recv(c, mem_ctx, reply_addr);
+                      struct nbt_name *name,
+                      TALLOC_CTX *mem_ctx,
+                      const char **reply_addr,
+                      struct tevent_context *ev)
+{
+        return resolve_name_ex(ctx, 0, 0, name, mem_ctx, reply_addr, ev);
 }
 

vendor/current/source4/libcli/resolve/resolve_lp.c

@@ -22 +22 @@
 #include "param/param.h"
 
-struct resolve_context *lp_resolve_context(struct loadparm_context *lp_ctx)
+struct resolve_context *lpcfg_resolve_context(struct loadparm_context *lp_ctx)
 {
-        const char **methods = lp_name_resolve_order(lp_ctx);
+        const char **methods = lpcfg_name_resolve_order(lp_ctx);
         int i;
         struct resolve_context *ret = resolve_context_init(lp_ctx);
@@ -36 +36 @@
                 } else if (!strcmp(methods[i], "bcast")) {
                         resolve_context_add_bcast_method_lp(ret, lp_ctx);
+                } else if (!strcmp(methods[i], "file")) {
+                        resolve_context_add_file_method_lp(ret, lp_ctx);
                 } else if (!strcmp(methods[i], "host")) {
                         resolve_context_add_host_method(ret);

vendor/current/source4/libcli/resolve/testsuite.c

@@ -25 +25 @@
 #include "torture/torture.h"
 #include "system/network.h"
+#include "lib/util/util_net.h"
 
 static bool test_async_resolve(struct torture_context *tctx)
@@ -82 +83 @@
 struct torture_suite *torture_local_resolve(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "RESOLVE");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "resolve");
 
         torture_suite_add_simple_test(suite, "async", test_async_resolve);

vendor/current/source4/libcli/resolve/wins.c

@@ -78 +78 @@
 {
         struct interface *ifaces;
-        load_interfaces(ctx, lp_interfaces(lp_ctx), &ifaces);
-        return resolve_context_add_wins_method(ctx, lp_wins_server_list(lp_ctx), ifaces, lp_nbt_port(lp_ctx), lp_parm_int(lp_ctx, NULL, "nbt", "timeout", 1));
+        load_interfaces(ctx, lpcfg_interfaces(lp_ctx), &ifaces);
+        return resolve_context_add_wins_method(ctx, lpcfg_wins_server_list(lp_ctx), ifaces, lpcfg_nbt_port(lp_ctx), lpcfg_parm_int(lp_ctx, NULL, "nbt", "timeout", 1));
 }