From 6b266b85cf34145ac1f03d8f787b81121e4ec92b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 16 Jul 2010 14:32:42 +1000 Subject: s4-loadparm: 2nd half of lp_ to lpcfg_ conversion this converts all callers that use the Samba4 loadparm lp_ calling convention to use the lpcfg_ prefix. Signed-off-by: Andrew Bartlett --- source4/dsdb/repl/drepl_out_helpers.c | 2 +- source4/dsdb/repl/drepl_ridalloc.c | 2 +- source4/dsdb/repl/drepl_service.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/dsdb/repl') diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c index 24110529c5..8ce9d0f1a3 100644 --- a/source4/dsdb/repl/drepl_out_helpers.c +++ b/source4/dsdb/repl/drepl_out_helpers.c @@ -581,7 +581,7 @@ static void dreplsrv_update_refs_trigger(struct tevent_req *req) ntds_dns_name = talloc_asprintf(r, "%s._msdcs.%s", ntds_guid_str, - lp_dnsdomain(service->task->lp_ctx)); + lpcfg_dnsdomain(service->task->lp_ctx)); if (tevent_req_nomem(ntds_dns_name, req)) { return; } diff --git a/source4/dsdb/repl/drepl_ridalloc.c b/source4/dsdb/repl/drepl_ridalloc.c index eaff581083..c036228ee7 100644 --- a/source4/dsdb/repl/drepl_ridalloc.c +++ b/source4/dsdb/repl/drepl_ridalloc.c @@ -79,7 +79,7 @@ static WERROR drepl_create_rid_manager_source_dsa(struct dreplsrv_service *servi sdsa->repsFrom1->other_info->dns_name = talloc_asprintf(sdsa->repsFrom1->other_info, "%s._msdcs.%s", GUID_string(sdsa->repsFrom1->other_info, &sdsa->repsFrom1->source_dsa_obj_guid), - lp_dnsdomain(service->task->lp_ctx)); + lpcfg_dnsdomain(service->task->lp_ctx)); if (!sdsa->repsFrom1->other_info->dns_name) { talloc_free(sdsa); return WERR_NOMEM; diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index e48ae3e563..652c16fda4 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -138,7 +138,7 @@ static void dreplsrv_task_init(struct task_server *task) bool am_rodc; int ret; - switch (lp_server_role(task->lp_ctx)) { + switch (lpcfg_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "dreplsrv: no DSDB replication required in standalone configuration", false); @@ -187,8 +187,8 @@ static void dreplsrv_task_init(struct task_server *task) return; } - periodic_startup_interval = lp_parm_int(task->lp_ctx, NULL, "dreplsrv", "periodic_startup_interval", 15); /* in seconds */ - service->periodic.interval = lp_parm_int(task->lp_ctx, NULL, "dreplsrv", "periodic_interval", 300); /* in seconds */ + periodic_startup_interval = lpcfg_parm_int(task->lp_ctx, NULL, "dreplsrv", "periodic_startup_interval", 15); /* in seconds */ + service->periodic.interval = lpcfg_parm_int(task->lp_ctx, NULL, "dreplsrv", "periodic_interval", 300); /* in seconds */ status = dreplsrv_periodic_schedule(service, periodic_startup_interval); if (!W_ERROR_IS_OK(status)) { @@ -201,7 +201,7 @@ static void dreplsrv_task_init(struct task_server *task) /* if we are a RODC then we do not send DSReplicaSync*/ ret = samdb_rodc(service->samdb, &am_rodc); if (ret == LDB_SUCCESS && !am_rodc) { - service->notify.interval = lp_parm_int(task->lp_ctx, NULL, "dreplsrv", + service->notify.interval = lpcfg_parm_int(task->lp_ctx, NULL, "dreplsrv", "notify_interval", 5); /* in seconds */ status = dreplsrv_notify_schedule(service, service->notify.interval); if (!W_ERROR_IS_OK(status)) { -- cgit