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

(This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

4 files changed, 8 insertions, 8 deletions

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);