Add context for libcli_resolve.

[samba-svnmirror.git] / source / libnet / libnet_site.c

diff --git a/source/libnet/libnet_site.c b/source/libnet/libnet_site.c
index 0c42bf1c73fdeda96b7691d7dd7f7b59d9a09230..08cedf0d957de4066ac750893ed81ab4e2b7875f 100644 (file)
--- a/source/libnet/libnet_site.c
+++ b/source/libnet/libnet_site.c
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -24,8 +23,10 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "librpc/rpc/dcerpc.h"
+#include "libcli/resolve/resolve.h"
+#include "param/param.h"
 
-/*
+/**
  * 1. Setup a CLDAP socket.
  * 2. Lookup the default Site-Name.
  */
@@ -50,6 +51,7 @@ NTSTATUS libnet_FindSite(TALLOC_CTX *ctx, struct libnet_JoinSite *r)
        /* Resolve the site name. */
        ZERO_STRUCT(search);
        search.in.dest_address = r->in.dest_address;
+       search.in.dest_port = lp_cldap_port(global_loadparm);
        search.in.acct_control = -1;
        search.in.version = 6;
 
@@ -78,6 +80,7 @@ NTSTATUS libnet_FindSite(TALLOC_CTX *ctx, struct libnet_JoinSite *r)
        }
 
        /* Generate the CN=Configuration,... DN. */
+/* TODO: look it up! */
        config_dn_str = talloc_asprintf(tmp_ctx, "CN=Configuration,%s", r->in.domain_dn_str);
        if (!config_dn_str) {
                r->out.error_string = NULL;
@@ -127,6 +130,8 @@ NTSTATUS libnet_JoinSite(struct ldb_context *remote_ldb,
 
        const char *server_dn_str;
        const char *config_dn_str;
+       struct nbt_name name;
+       const char *dest_addr = NULL;
 
        tmp_ctx = talloc_named(libnet_r, 0, "libnet_JoinSite temp context");
        if (!tmp_ctx) {
@@ -141,8 +146,16 @@ NTSTATUS libnet_JoinSite(struct ldb_context *remote_ldb,
                return NT_STATUS_NO_MEMORY;
        }
 
+       make_nbt_name_client(&name, libnet_r->out.samr_binding->host);
+       status = resolve_name(lp_resolve_context(global_loadparm), &name, r, &dest_addr, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               libnet_r->out.error_string = NULL;
+               talloc_free(tmp_ctx);
+               return status;
+       }
+
        /* Resolve the site name and AD DN's. */
-       r->in.dest_address = libnet_r->out.samr_binding->host;
+       r->in.dest_address = dest_addr;
        r->in.netbios_name = libnet_r->in.netbios_name;
        r->in.domain_dn_str = libnet_r->out.domain_dn_str;
 
@@ -151,7 +164,7 @@ NTSTATUS libnet_JoinSite(struct ldb_context *remote_ldb,
                libnet_r->out.error_string =
                        talloc_steal(libnet_r, r->out.error_string);
                talloc_free(tmp_ctx);
-               return NT_STATUS_NO_MEMORY;
+               return status;
        }
 
        config_dn_str = r->out.config_dn_str;