summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-02 16:20:41 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:00 +0100
commit33f26f8e547dae1c06282d6e6f89b3b37979a730 (patch)
tree791a3b8b95db33ca836bce9f03e8e7f83164d073 /source4
parent8d8ad81437555affe0ce189ab9b7049501c708b1 (diff)
downloadsamba-33f26f8e547dae1c06282d6e6f89b3b37979a730.tar.gz
samba-33f26f8e547dae1c06282d6e6f89b3b37979a730.tar.bz2
samba-33f26f8e547dae1c06282d6e6f89b3b37979a730.zip
r26225: Remove use of global_loadparm in wins server.
(This used to be commit 98c29e090fd448193ca6fca8f90751bfd0cb2e74)
Diffstat (limited to 'source4')
-rw-r--r--source4/wrepl_server/wrepl_server.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 834d9a70e8..cec2e6e65e 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -33,11 +33,11 @@
#include "ldb_wrap.h"
#include "param/param.h"
-static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx)
+static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx,
+ struct loadparm_context *lp_ctx)
{
- return ldb_wrap_connect(mem_ctx, global_loadparm, private_path(mem_ctx,
- global_loadparm,
- lp_wins_config_url(global_loadparm)),
+ return ldb_wrap_connect(mem_ctx, lp_ctx, private_path(mem_ctx,
+ lp_ctx, lp_wins_config_url(lp_ctx)),
system_session(mem_ctx), NULL, 0, NULL);
}
@@ -71,39 +71,40 @@ failed:
/*
open winsdb
*/
-static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service)
+static NTSTATUS wreplsrv_open_winsdb(struct wreplsrv_service *service,
+ struct loadparm_context *lp_ctx)
{
service->wins_db = winsdb_connect(service, WINSDB_HANDLE_CALLER_WREPL);
if (!service->wins_db) {
return NT_STATUS_INTERNAL_DB_ERROR;
}
- service->config.ldb = wins_config_db_connect(service);
+ service->config.ldb = wins_config_db_connect(service, lp_ctx);
if (!service->config.ldb) {
return NT_STATUS_INTERNAL_DB_ERROR;
}
/* the default renew interval is 6 days */
- service->config.renew_interval = lp_parm_int(global_loadparm, NULL,"wreplsrv","renew_interval", 6*24*60*60);
+ service->config.renew_interval = lp_parm_int(lp_ctx, NULL,"wreplsrv","renew_interval", 6*24*60*60);
/* the default tombstone (extinction) interval is 6 days */
- service->config.tombstone_interval= lp_parm_int(global_loadparm, NULL,"wreplsrv","tombstone_interval", 6*24*60*60);
+ service->config.tombstone_interval= lp_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_interval", 6*24*60*60);
/* the default tombstone (extinction) timeout is 1 day */
- service->config.tombstone_timeout = lp_parm_int(global_loadparm, NULL,"wreplsrv","tombstone_timeout", 1*24*60*60);
+ service->config.tombstone_timeout = lp_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_timeout", 1*24*60*60);
/* the default tombstone extra timeout is 3 days */
- service->config.tombstone_extra_timeout = lp_parm_int(global_loadparm, NULL,"wreplsrv","tombstone_extra_timeout", 3*24*60*60);
+ service->config.tombstone_extra_timeout = lp_parm_int(lp_ctx, NULL,"wreplsrv","tombstone_extra_timeout", 3*24*60*60);
/* the default verify interval is 24 days */
- service->config.verify_interval = lp_parm_int(global_loadparm, NULL,"wreplsrv","verify_interval", 24*24*60*60);
+ service->config.verify_interval = lp_parm_int(lp_ctx, NULL,"wreplsrv","verify_interval", 24*24*60*60);
/* the default scavenging interval is 'renew_interval/2' */
- service->config.scavenging_interval=lp_parm_int(global_loadparm, NULL,"wreplsrv","scavenging_interval",
+ service->config.scavenging_interval=lp_parm_int(lp_ctx, NULL,"wreplsrv","scavenging_interval",
service->config.renew_interval/2);
/* the maximun interval to the next periodic processing event */
- service->config.periodic_interval = lp_parm_int(global_loadparm, NULL,"wreplsrv","periodic_interval", 15);
+ service->config.periodic_interval = lp_parm_int(lp_ctx, NULL,"wreplsrv","periodic_interval", 15);
return NT_STATUS_OK;
}
@@ -457,7 +458,7 @@ static void wreplsrv_task_init(struct task_server *task)
/*
* setup up all partners, and open the winsdb
*/
- status = wreplsrv_open_winsdb(service);
+ status = wreplsrv_open_winsdb(service, global_loadparm);
if (!NT_STATUS_IS_OK(status)) {
task_server_terminate(task, "wreplsrv_task_init: wreplsrv_open_winsdb() failed");
return;