r26313: Fix more uses of static loadparm.

(This used to be commit 6fd0d9d3b75546d08c24c513e05b1843d5777608)

3 files changed, 19 insertions, 17 deletions

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 5f0c81f94e..46bfaa9381 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -28,6 +28,7 @@
 #include "util/util_ldb.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
+#include "smbd/service_task.h"
 
 /*
   reply to a GETDC request
@@ -53,7 +54,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 		return;
 	}
 
-	samctx = samdb_connect(packet, global_loadparm, anonymous_session(packet, global_loadparm));
+	samctx = samdb_connect(packet, iface->nbtsrv->task->lp_ctx, anonymous_session(packet, iface->nbtsrv->task->lp_ctx));
 	if (samctx == NULL) {
 		DEBUG(2,("Unable to open sam in getdc reply\n"));
 		return;
@@ -75,7 +76,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 	reply.command = NETLOGON_RESPONSE_FROM_PDC;
 	pdc = &reply.req.response;
 
-	pdc->pdc_name         = lp_netbios_name(global_loadparm);
+	pdc->pdc_name         = lp_netbios_name(iface->nbtsrv->task->lp_ctx);
 	pdc->unicode_pdc_name = pdc->pdc_name;
 	pdc->domain_name      = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
 	pdc->nt_version       = 1;
@@ -87,7 +88,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 
 	dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
 				      packet, 
-				      lp_netbios_name(global_loadparm),
+				      lp_netbios_name(iface->nbtsrv->task->lp_ctx),
 				      netlogon->req.pdc.mailslot_name,
 				      &reply);
 }
@@ -111,7 +112,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
 	const char *dom_attrs[] = {"objectGUID", NULL};
 	struct ldb_message **ref_res, **dom_res;
 	int ret;
-	const char **services = lp_server_services(global_loadparm);
+	const char **services = lp_server_services(iface->nbtsrv->task->lp_ctx);
 	const char *my_ip = reply_iface->ip_address; 
 	struct ldb_dn *partitions_basedn;
 	if (!my_ip) {
@@ -124,7 +125,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
 		return;
 	}
 
-	samctx = samdb_connect(packet, global_loadparm, anonymous_session(packet, global_loadparm));
+	samctx = samdb_connect(packet, iface->nbtsrv->task->lp_ctx, anonymous_session(packet, iface->nbtsrv->task->lp_ctx));
 	if (samctx == NULL) {
 		DEBUG(2,("Unable to open sam in getdc reply\n"));
 		return;
@@ -185,17 +186,17 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
 
 	pdc->domain_uuid      = samdb_result_guid(dom_res[0], "objectGUID");
 	pdc->forest           = samdb_result_string(ref_res[0], "dnsRoot", 
-						    lp_realm(global_loadparm));
+						    lp_realm(iface->nbtsrv->task->lp_ctx));
 	pdc->dns_domain       = samdb_result_string(ref_res[0], "dnsRoot", 
-						    lp_realm(global_loadparm));
+						    lp_realm(iface->nbtsrv->task->lp_ctx));
 
 	/* TODO: get our full DNS name from somewhere else */
 	pdc->pdc_dns_name     = talloc_asprintf(packet, "%s.%s", 
 						strlower_talloc(packet, 
-								lp_netbios_name(global_loadparm)), 
+								lp_netbios_name(iface->nbtsrv->task->lp_ctx)), 
 						pdc->dns_domain);
 	pdc->domain           = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
-	pdc->pdc_name         = lp_netbios_name(global_loadparm);
+	pdc->pdc_name         = lp_netbios_name(iface->nbtsrv->task->lp_ctx);
 	pdc->user_name        = netlogon->req.pdc2.user_name;
 	/* TODO: we need to make sure these are in our DNS zone */
 	pdc->server_site      = "Default-First-Site-Name";
@@ -211,7 +212,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
 
 	dgram_mailslot_netlogon_reply(reply_iface->dgmsock, 
 				      packet, 
-				      lp_netbios_name(global_loadparm),
+				      lp_netbios_name(iface->nbtsrv->task->lp_ctx),
 				      netlogon->req.pdc2.mailslot_name,
 				      &reply);
 }
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 942fc77b98..352be34489 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "nbt_server/nbt_server.h"
+#include "smbd/service_task.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
@@ -50,9 +51,9 @@ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot,
 	logon = &reply.req.reply;
 
 	logon->server           = talloc_asprintf(packet, "\\\\%s", 
-						  lp_netbios_name(global_loadparm));
+						  lp_netbios_name(iface->nbtsrv->task->lp_ctx));
 	logon->user_name        = ntlogon->req.logon.user_name;
-	logon->domain           = lp_workgroup(global_loadparm);
+	logon->domain           = lp_workgroup(iface->nbtsrv->task->lp_ctx);
 	logon->nt_version       = 1;
 	logon->lmnt_token       = 0xFFFF;
 	logon->lm20_token       = 0xFFFF;
@@ -61,7 +62,7 @@ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot,
 
 	dgram_mailslot_ntlogon_reply(reply_iface->dgmsock, 
 				     packet, 
-				     lp_netbios_name(global_loadparm),
+				     lp_netbios_name(iface->nbtsrv->task->lp_ctx),
 				     ntlogon->req.logon.mailslot_name,
 				     &reply);
 }
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index 48d6e4cb3a..45426c31ba 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -81,7 +81,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 	
 		bcast_addr = socket_address_from_strings(tmp_ctx, bcast_dgmsock->sock->backend_name, 
 							 iface->bcast_address, 
-							 lp_dgram_port(global_loadparm));
+							 lp_dgram_port(iface->nbtsrv->task->lp_ctx));
 		if (!bcast_addr) {
 			talloc_free(tmp_ctx);
 			return NT_STATUS_NO_MEMORY;
@@ -91,7 +91,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 		if (!NT_STATUS_IS_OK(status)) {
 			talloc_free(tmp_ctx);
 			DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-				 iface->bcast_address, lp_dgram_port(global_loadparm), 
+				 iface->bcast_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx), 
 				 nt_errstr(status)));
 			return status;
 		}
@@ -107,7 +107,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 	}
 
 	bind_addr = socket_address_from_strings(tmp_ctx, iface->dgmsock->sock->backend_name, 
-						bind_address, lp_dgram_port(global_loadparm));
+						bind_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx));
 	if (!bind_addr) {
 		talloc_free(tmp_ctx);
 		return NT_STATUS_NO_MEMORY;
@@ -117,7 +117,7 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(tmp_ctx);
 		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-			 bind_address, lp_dgram_port(global_loadparm), nt_errstr(status)));
+			 bind_address, lp_dgram_port(iface->nbtsrv->task->lp_ctx), nt_errstr(status)));
 		return status;
 	}