Author: jelmer Date: 2007-12-13 22:46:37 +0000 (Thu, 13 Dec 2007) New Revision: 26435
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26435 Log: Remove global_loadparm instance. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/libcli/finddcs.c branches/SAMBA_4_0/source/libnet/libnet_lookup.c branches/SAMBA_4_0/source/winbind/wb_dom_info.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/libcli/finddcs.c =================================================================== --- branches/SAMBA_4_0/source/libcli/finddcs.c 2007-12-13 22:46:33 UTC (rev 26434) +++ branches/SAMBA_4_0/source/libcli/finddcs.c 2007-12-13 22:46:37 UTC (rev 26435) @@ -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 @@ 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 @@ 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(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 @@ { 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); Modified: branches/SAMBA_4_0/source/libnet/libnet_lookup.c =================================================================== --- branches/SAMBA_4_0/source/libnet/libnet_lookup.c 2007-12-13 22:46:33 UTC (rev 26434) +++ branches/SAMBA_4_0/source/libnet/libnet_lookup.c 2007-12-13 22:46:37 UTC (rev 26435) @@ -194,7 +194,7 @@ 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; Modified: branches/SAMBA_4_0/source/winbind/wb_dom_info.c =================================================================== --- branches/SAMBA_4_0/source/winbind/wb_dom_info.c 2007-12-13 22:46:33 UTC (rev 26434) +++ branches/SAMBA_4_0/source/winbind/wb_dom_info.c 2007-12-13 22:46:37 UTC (rev 26435) @@ -68,6 +68,7 @@ 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),
