summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 22:46:37 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:04 +0100
commit70ccac0f05067c89bbf1503a614d09e3fd429110 (patch)
tree4d9d7425b5ac34ddb70189707a12464f6fe98415
parent2bf0cdd01cf399bf28125f9e2a0d419f4e94996c (diff)
downloadsamba-70ccac0f05067c89bbf1503a614d09e3fd429110.tar.gz
samba-70ccac0f05067c89bbf1503a614d09e3fd429110.tar.bz2
samba-70ccac0f05067c89bbf1503a614d09e3fd429110.zip
r26435: Remove global_loadparm instance.
(This used to be commit 66fd8d480bdfeb1c95da8843da3d18abe3f997e1)
-rw-r--r--source4/libcli/finddcs.c6
-rw-r--r--source4/libnet/libnet_lookup.c2
-rw-r--r--source4/winbind/wb_dom_info.c1
3 files changed, 6 insertions, 3 deletions
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index 4b7f2dce8c..606809751e 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -28,7 +28,6 @@
#include "libcli/libcli.h"
#include "libcli/resolve/resolve.h"
#include "libcli/finddcs.h"
-#include "param/param.h"
struct finddcs_state {
struct composite_context *ctx;
@@ -63,6 +62,7 @@ static void fallback_node_status_replied(struct nbt_name_request *name_req);
struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
const char *my_netbios_name,
+ uint16_t nbt_port,
const char *domain_name,
int name_type,
struct dom_sid *domain_sid,
@@ -83,7 +83,7 @@ struct composite_context *finddcs_send(TALLOC_CTX *mem_ctx,
state->ctx = c;
- state->nbt_port = lp_nbt_port(global_loadparm);
+ state->nbt_port = nbt_port;
state->my_netbios_name = talloc_strdup(state, my_netbios_name);
state->domain_name = talloc_strdup(state, domain_name);
if (composite_nomem(state->domain_name, c)) return c;
@@ -250,6 +250,7 @@ NTSTATUS finddcs_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
NTSTATUS finddcs(TALLOC_CTX *mem_ctx,
const char *my_netbios_name,
+ uint16_t nbt_port,
const char *domain_name, int name_type,
struct dom_sid *domain_sid,
struct resolve_context *resolve_ctx,
@@ -259,6 +260,7 @@ NTSTATUS finddcs(TALLOC_CTX *mem_ctx,
{
struct composite_context *c = finddcs_send(mem_ctx,
my_netbios_name,
+ nbt_port,
domain_name, name_type,
domain_sid, resolve_ctx,
event_ctx, msg_ctx);
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index b8c6609d8e..a7442eb32d 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -194,7 +194,7 @@ struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx,
struct messaging_context *msg_ctx =
messaging_client_init(mem_ctx, lp_messaging_path(mem_ctx, ctx->lp_ctx), ctx->event_ctx);
- c = finddcs_send(mem_ctx, lp_netbios_name(ctx->lp_ctx),
+ c = finddcs_send(mem_ctx, lp_netbios_name(ctx->lp_ctx), lp_nbt_port(ctx->lp_ctx),
io->in.domain_name, io->in.name_type,
NULL, ctx->resolve_ctx, ctx->event_ctx, msg_ctx);
return c;
diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c
index 05b63e67c8..7558fc9d62 100644
--- a/source4/winbind/wb_dom_info.c
+++ b/source4/winbind/wb_dom_info.c
@@ -68,6 +68,7 @@ struct composite_context *wb_get_dom_info_send(TALLOC_CTX *mem_ctx,
if (dom_sid == NULL) goto failed;
ctx = finddcs_send(mem_ctx, lp_netbios_name(service->task->lp_ctx),
+ lp_nbt_port(service->task->lp_ctx),
domain_name, NBT_NAME_LOGON,
dom_sid,
lp_resolve_context(service->task->lp_ctx),