r26223: Move loadparm context up in the stack.

(This used to be commit 152e2b1a283675b53affb8f7225644925f171dbd)

diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 9903595dfb929f351ccf4eeb31a69bf3f4b30fe9..88421ad08d8c39f5c74e419f3448a0fe70a6b590 100644 (file)
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -317,7 +317,7 @@ struct cldap_request *cldap_search_send(struct cldap_socket *cldap,
 
        req->dest = socket_address_from_strings(req, cldap->sock->backend_name,
                                                io->in.dest_address, 
-                                               lp_cldap_port(global_loadparm));
+                                               io->in.dest_port);
        if (!req->dest) goto failed;
 
        req->message_id = idr_get_new_random(cldap->idr, req, UINT16_MAX);
@@ -572,6 +572,7 @@ struct cldap_request *cldap_netlogon_send(struct cldap_socket *cldap,
        if (filter == NULL) goto failed;
 
        search.in.dest_address = io->in.dest_address;
+       search.in.dest_port    = lp_cldap_port(global_loadparm);
        search.in.filter       = filter;
        search.in.attributes   = attr;
        search.in.timeout      = 2;

diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index e957ccea19a44825af91875ce856f00acf5ceabb..cdee775aa797072f2cd8da1046f5b1ed99be72ae 100644 (file)
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/libcli/cldap/cldap.h
@@ -98,6 +98,7 @@ struct cldap_socket {
 struct cldap_search {
        struct {
                const char *dest_address;
+               uint16_t dest_port;
                const char *filter;
                const char **attributes;
                int timeout;

diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index 3b5f67118f4ca60e47b59ec4adb55262c61295c7..ab831df8ccb96f4991de29a3dceef7cf6d7531a8 100644 (file)
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -56,6 +56,7 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
 NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
                                     struct nbt_dgram_packet *request,
                                     const char *mailslot_name,
+                                    const char *my_netbios_name,
                                     struct nbt_browse_packet *reply)
 {
        NTSTATUS status;
@@ -72,7 +73,7 @@ NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
                return ndr_map_error2ntstatus(ndr_err);
        }
 
-       make_nbt_name_client(&myname, lp_netbios_name(global_loadparm));
+       make_nbt_name_client(&myname, my_netbios_name);
 
        dest = socket_address_from_strings(tmp_ctx, dgmsock->sock->backend_name, 
                                           request->src_addr, request->src_port);

diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index 8165e445bcbfba86330ce5525e3e8fb9a9148d7d..9f67d58ae26334726f14c75f66516453ac2a559d 100644 (file)
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -154,6 +154,7 @@ NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
 NTSTATUS dgram_mailslot_browse_reply(struct nbt_dgram_socket *dgmsock,
                                     struct nbt_dgram_packet *request,
                                     const char *mailslot_name,
+                                    const char *my_netbios_name,
                                     struct nbt_browse_packet *reply);
 
 NTSTATUS dgram_mailslot_browse_parse(struct dgram_mailslot_handler *dgmslot,

diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c
index f258a1c32f67092e68a74b17d6287ffb9c210593..a254a0ec091f37a9c2f1f2ed59a88064b22e0528 100644 (file)
--- a/source4/torture/ldap/cldap.c
+++ b/source4/torture/ldap/cldap.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "torture/torture.h"
 #include "lib/ldb/include/ldb.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \
@@ -215,6 +216,7 @@ static bool test_cldap_generic(TALLOC_CTX *mem_ctx, const char *dest)
 
        ZERO_STRUCT(search);
        search.in.dest_address = dest;
+       search.in.dest_port = lp_cldap_port(global_loadparm);
        search.in.timeout = 10;
        search.in.retries = 3;