r25398: Parse loadparm context to all lp_*() functions.

(This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

11 files changed, 47 insertions, 40 deletions

diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index eb06abd74a..ba32bb123e 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -75,7 +75,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();
+	pdc->pdc_name         = lp_netbios_name(global_loadparm);
 	pdc->unicode_pdc_name = pdc->pdc_name;
 	pdc->domain_name      = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
 	pdc->nt_version       = 1;
@@ -110,7 +110,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();
+	const char **services = lp_server_services(global_loadparm);
 	const char *my_ip = reply_iface->ip_address; 
 	struct ldb_dn *partitions_basedn;
 	if (!my_ip) {
@@ -183,15 +183,18 @@ 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());
-	pdc->dns_domain       = samdb_result_string(ref_res[0], "dnsRoot", lp_realm());
+	pdc->forest           = samdb_result_string(ref_res[0], "dnsRoot", 
+						    lp_realm(global_loadparm));
+	pdc->dns_domain       = samdb_result_string(ref_res[0], "dnsRoot", 
+						    lp_realm(global_loadparm));
 
 	/* TODO: get our full DNS name from somewhere else */
 	pdc->pdc_dns_name     = talloc_asprintf(packet, "%s.%s", 
-						strlower_talloc(packet, lp_netbios_name()), 
+						strlower_talloc(packet, 
+								lp_netbios_name(global_loadparm)), 
 						pdc->dns_domain);
 	pdc->domain           = samdb_result_string(ref_res[0], "nETBIOSName", name->name);;
-	pdc->pdc_name         = lp_netbios_name();
+	pdc->pdc_name         = lp_netbios_name(global_loadparm);
 	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";
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index e24dffb4f4..9d80a44ce6 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -49,9 +49,10 @@ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot,
 	reply.command = NTLOGON_SAM_LOGON_REPLY;
 	logon = &reply.req.reply;
 
-	logon->server           = talloc_asprintf(packet, "\\\\%s", lp_netbios_name());
+	logon->server           = talloc_asprintf(packet, "\\\\%s", 
+						  lp_netbios_name(global_loadparm));
 	logon->user_name        = ntlogon->req.logon.user_name;
-	logon->domain           = lp_workgroup();
+	logon->domain           = lp_workgroup(global_loadparm);
 	logon->nt_version       = 1;
 	logon->lmnt_token       = 0xFFFF;
 	logon->lm20_token       = 0xFFFF;
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index da15340305..48d6e4cb3a 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -80,7 +80,8 @@ 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());
+							 iface->bcast_address, 
+							 lp_dgram_port(global_loadparm));
 		if (!bcast_addr) {
 			talloc_free(tmp_ctx);
 			return NT_STATUS_NO_MEMORY;
@@ -90,7 +91,8 @@ 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(), nt_errstr(status)));
+				 iface->bcast_address, lp_dgram_port(global_loadparm), 
+				 nt_errstr(status)));
 			return status;
 		}
 	
@@ -105,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());
+						bind_address, lp_dgram_port(global_loadparm));
 	if (!bind_addr) {
 		talloc_free(tmp_ctx);
 		return NT_STATUS_NO_MEMORY;
@@ -115,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(), nt_errstr(status)));
+			 bind_address, lp_dgram_port(global_loadparm), nt_errstr(status)));
 		return status;
 	}
 
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index 40fa605e11..27d733aeff 100644
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -136,7 +136,7 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv,
 		}
 
 		bcast_address = socket_address_from_strings(bcast_nbtsock, bcast_nbtsock->sock->backend_name, 
-							    bcast, lp_nbt_port());
+							    bcast, lp_nbt_port(global_loadparm));
 		if (!bcast_address) {
 			talloc_free(iface);
 			return NT_STATUS_NO_MEMORY;
@@ -145,7 +145,7 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv,
 		status = socket_listen(bcast_nbtsock->sock, bcast_address, 0, 0);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-				 bcast, lp_nbt_port(), nt_errstr(status)));
+				 bcast, lp_nbt_port(global_loadparm), nt_errstr(status)));
 			talloc_free(iface);
 			return status;
 		}
@@ -161,13 +161,14 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	unicast_address = socket_address_from_strings(iface->nbtsock, iface->nbtsock->sock->backend_name, 
-						      bind_address, lp_nbt_port());
+	unicast_address = socket_address_from_strings(iface->nbtsock, 
+						      iface->nbtsock->sock->backend_name, 
+						      bind_address, lp_nbt_port(global_loadparm));
 
 	status = socket_listen(iface->nbtsock->sock, unicast_address, 0, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-			 bind_address, lp_nbt_port(), nt_errstr(status)));
+			 bind_address, lp_nbt_port(global_loadparm), nt_errstr(status)));
 		talloc_free(iface);
 		return status;
 	}
@@ -223,7 +224,7 @@ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv)
 
 	/* if we are allowing incoming packets from any address, then
 	   we also need to bind to the wildcard address */
-	if (!lp_bind_interfaces_only()) {
+	if (!lp_bind_interfaces_only(global_loadparm)) {
 		const char *primary_address;
 
 		/* the primary address is the address we will return
@@ -233,7 +234,7 @@ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv)
 			primary_address = iface_n_ip(0);
 		} else {
 			primary_address = sys_inet_ntoa(interpret_addr2(
-								lp_netbios_name()));
+							lp_netbios_name(global_loadparm)));
 		}
 		primary_address = talloc_strdup(tmp_ctx, primary_address);
 		NT_STATUS_HAVE_NO_MEMORY(primary_address);
@@ -261,7 +262,7 @@ NTSTATUS nbtd_startup_interfaces(struct nbtd_server *nbtsrv)
 		NT_STATUS_NOT_OK_RETURN(status);
 	}
 
-	if (lp_wins_server_list()) {
+	if (lp_wins_server_list(global_loadparm)) {
 		status = nbtd_add_wins_socket(nbtsrv);
 		NT_STATUS_NOT_OK_RETURN(status);
 	}
diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index 747b41076c..5a220d1546 100644
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -78,7 +78,7 @@ BOOL nbtd_self_packet(struct nbt_name_socket *nbtsock,
 	struct nbtd_server *nbtsrv = iface->nbtsrv;
 	
 	/* if its not from the nbt port, then it wasn't a broadcast from us */
-	if (src->port != lp_nbt_port()) {
+	if (src->port != lp_nbt_port(global_loadparm)) {
 		return False;
 	}
 
diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index 30b3c5f9ce..f57cb7bf76 100644
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -81,7 +81,7 @@ void nbtd_request_query(struct nbt_name_socket *nbtsock,
 	if (!(packet->operation & NBT_FLAG_BROADCAST) &&
 	   (packet->operation & NBT_FLAG_RECURSION_DESIRED) &&
 	   (iname->nb_flags & NBT_NM_GROUP) &&
-	   lp_wins_support()) {
+	   lp_wins_support(global_loadparm)) {
 		nbtd_winsserver_request(nbtsock, packet, src);
 		return;
 	}
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index af067d071c..cb831f3443 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -170,7 +170,7 @@ static void nbtd_register_name_iface(struct nbtd_interface *iface,
 				     uint16_t nb_flags)
 {
 	struct nbtd_iface_name *iname;
-	const char *scope = lp_netbios_scope();
+	const char *scope = lp_netbios_scope(global_loadparm);
 	struct nbt_name_register_bcast io;
 	struct composite_context *creq;
 	struct nbtd_server *nbtsrv = iface->nbtsrv;
@@ -260,29 +260,29 @@ void nbtd_register_names(struct nbtd_server *nbtsrv)
 
 	/* note that we don't initially mark the names "ACTIVE". They are 
 	   marked active once registration is successful */
-	nbtd_register_name(nbtsrv, lp_netbios_name(), NBT_NAME_CLIENT, nb_flags);
-	nbtd_register_name(nbtsrv, lp_netbios_name(), NBT_NAME_USER,   nb_flags);
-	nbtd_register_name(nbtsrv, lp_netbios_name(), NBT_NAME_SERVER, nb_flags);
+	nbtd_register_name(nbtsrv, lp_netbios_name(global_loadparm), NBT_NAME_CLIENT, nb_flags);
+	nbtd_register_name(nbtsrv, lp_netbios_name(global_loadparm), NBT_NAME_USER,   nb_flags);
+	nbtd_register_name(nbtsrv, lp_netbios_name(global_loadparm), NBT_NAME_SERVER, nb_flags);
 
-	aliases = lp_netbios_aliases();
+	aliases = lp_netbios_aliases(global_loadparm);
 	while (aliases && aliases[0]) {
 		nbtd_register_name(nbtsrv, aliases[0], NBT_NAME_CLIENT, nb_flags);
 		nbtd_register_name(nbtsrv, aliases[0], NBT_NAME_SERVER, nb_flags);
 		aliases++;
 	}
 
-	if (lp_server_role() == ROLE_DOMAIN_CONTROLLER)	{
-		BOOL is_pdc = samdb_is_pdc(nbtsrv->sam_ctx);
+	if (lp_server_role(global_loadparm) == ROLE_DOMAIN_CONTROLLER)	{
+		bool is_pdc = samdb_is_pdc(nbtsrv->sam_ctx);
 		if (is_pdc) {
-			nbtd_register_name(nbtsrv, lp_workgroup(),
+			nbtd_register_name(nbtsrv, lp_workgroup(global_loadparm),
 					   NBT_NAME_PDC, nb_flags);
 		}
-		nbtd_register_name(nbtsrv, lp_workgroup(),
+		nbtd_register_name(nbtsrv, lp_workgroup(global_loadparm),
 				   NBT_NAME_LOGON, nb_flags | NBT_NM_GROUP);
 	}
 
 	nb_flags |= NBT_NM_GROUP;
-	nbtd_register_name(nbtsrv, lp_workgroup(),    NBT_NAME_CLIENT, nb_flags);
+	nbtd_register_name(nbtsrv, lp_workgroup(global_loadparm), NBT_NAME_CLIENT, nb_flags);
 
 	nb_flags |= NBT_NM_PERMANENT;
 	nbtd_register_name(nbtsrv, "__SAMBA__",       NBT_NAME_CLIENT, nb_flags);
diff --git a/source4/nbt_server/wins/wins_hook.c b/source4/nbt_server/wins/wins_hook.c
index 090621d890..768f9477f6 100644
--- a/source4/nbt_server/wins/wins_hook.c
+++ b/source4/nbt_server/wins/wins_hook.c
@@ -40,7 +40,7 @@ static const char *wins_hook_action_string(enum wins_hook_action action)
 void wins_hook(struct winsdb_handle *h, const struct winsdb_record *rec, 
 	       enum wins_hook_action action)
 {
-	const char *script = lp_wins_hook();
+	const char *script = lp_wins_hook(global_loadparm);
 	uint32_t i, length;
 	int child;
 	char *cmd = NULL;
diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index e18885c327..1dd934cc92 100644
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -236,7 +236,7 @@ void nbtd_winsclient_register(struct nbtd_iface_name *iname)
 
 	/* setup a wins name register request */
 	io.in.name            = iname->name;
-	io.in.wins_servers    = lp_wins_server_list();
+	io.in.wins_servers    = lp_wins_server_list(global_loadparm);
 	io.in.addresses       = nbtd_address_list(iface, iname);
 	io.in.nb_flags        = iname->nb_flags;
 	io.in.ttl             = iname->ttl;
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 6b26ba2d63..f7d149126b 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -992,7 +992,7 @@ static BOOL winsdb_check_or_add_module_list(struct winsdb_handle *h)
 		flags |= LDB_FLG_NOSYNC;
 	}
 
-	h->ldb = ldb_wrap_connect(h, lock_path(h, lp_wins_url()),
+	h->ldb = ldb_wrap_connect(h, lock_path(h, lp_wins_url(global_loadparm)),
 				  NULL, NULL, flags, NULL);
 	if (!h->ldb) goto failed;
 
@@ -1025,7 +1025,7 @@ struct winsdb_handle *winsdb_connect(TALLOC_CTX *mem_ctx, enum winsdb_handle_cal
 		flags |= LDB_FLG_NOSYNC;
 	}
 
-	h->ldb = ldb_wrap_connect(h, lock_path(h, lp_wins_url()),
+	h->ldb = ldb_wrap_connect(h, lock_path(h, lp_wins_url(global_loadparm)),
 				  NULL, NULL, flags, NULL);
 	if (!h->ldb) goto failed;	
 
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index fd0188cbf0..698d432c75 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -706,7 +706,7 @@ static void nbtd_winsserver_query(struct nbt_name_socket *nbtsock,
 
 	status = winsdb_lookup(winssrv->wins_db, name, packet, &rec);
 	if (!NT_STATUS_IS_OK(status)) {
-		if (!lp_wins_dns_proxy()) {
+		if (!lp_wins_dns_proxy(global_loadparm)) {
 			goto notfound;
 		}
 
@@ -957,7 +957,7 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv)
 {
 	uint32_t tmp;
 
-	if (!lp_wins_support()) {
+	if (!lp_wins_support(global_loadparm)) {
 		nbtsrv->winssrv = NULL;
 		return NT_STATUS_OK;
 	}
@@ -965,8 +965,8 @@ NTSTATUS nbtd_winsserver_init(struct nbtd_server *nbtsrv)
 	nbtsrv->winssrv = talloc_zero(nbtsrv, struct wins_server);
 	NT_STATUS_HAVE_NO_MEMORY(nbtsrv->winssrv);
 
-	nbtsrv->winssrv->config.max_renew_interval = lp_max_wins_ttl();
-	nbtsrv->winssrv->config.min_renew_interval = lp_min_wins_ttl();
+	nbtsrv->winssrv->config.max_renew_interval = lp_max_wins_ttl(global_loadparm);
+	nbtsrv->winssrv->config.min_renew_interval = lp_min_wins_ttl(global_loadparm);
 	tmp = lp_parm_int(NULL, "wreplsrv", "tombstone_interval", 6*24*60*60);
 	nbtsrv->winssrv->config.tombstone_interval = tmp;
 	tmp = lp_parm_int(NULL, "wreplsrv"," tombstone_timeout", 1*24*60*60);