diff options
| author | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-07-16 09:57:03 -0400 |
| commit | 378e4d5b8d30733f0f28cc2bceb28d9b9b594707 (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/dsdb/kcc | |
| parent | 2f249538ac8f2a54d9c8f8dbf0107db2f33bfe16 (diff) | |
| parent | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (diff) | |
| download | samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.gz samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.tar.bz2 samba-378e4d5b8d30733f0f28cc2bceb28d9b9b594707.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/dsdb/kcc')
| -rw-r--r-- | source4/dsdb/kcc/kcc_deleted.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/kcc/kcc_periodic.c | 2 | ||||
| -rw-r--r-- | source4/dsdb/kcc/kcc_service.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/dsdb/kcc/kcc_deleted.c b/source4/dsdb/kcc/kcc_deleted.c index dae9a8ef1b..118952a143 100644 --- a/source4/dsdb/kcc/kcc_deleted.c +++ b/source4/dsdb/kcc/kcc_deleted.c @@ -46,7 +46,7 @@ NTSTATUS kccsrv_check_deleted(struct kccsrv_service *s, TALLOC_CTX *mem_ctx) uint32_t tombstoneLifetime; time_t t = time(NULL); - if (t - s->last_deleted_check < lp_parm_int(s->task->lp_ctx, NULL, "kccsrv", + if (t - s->last_deleted_check < lpcfg_parm_int(s->task->lp_ctx, NULL, "kccsrv", "check_deleted_interval", 600)) { return NT_STATUS_OK; } diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c index 9937e2e6dd..3f37208dec 100644 --- a/source4/dsdb/kcc/kcc_periodic.c +++ b/source4/dsdb/kcc/kcc_periodic.c @@ -233,7 +233,7 @@ NTSTATUS kccsrv_simple_update(struct kccsrv_service *s, TALLOC_CTX *mem_ctx) r1->other_info = talloc_zero(reps, struct repsFromTo1OtherInfo); r1->other_info->dns_name = talloc_asprintf(r1->other_info, "%s._msdcs.%s", GUID_string(mem_ctx, &ntds_guid), - lp_dnsdomain(s->task->lp_ctx)); + lpcfg_dnsdomain(s->task->lp_ctx)); r1->source_dsa_obj_guid = ntds_guid; r1->source_dsa_invocation_id = invocation_id; r1->replica_flags = diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c index 989b8f8c58..4507545355 100644 --- a/source4/dsdb/kcc/kcc_service.c +++ b/source4/dsdb/kcc/kcc_service.c @@ -169,7 +169,7 @@ static void kccsrv_task_init(struct task_server *task) struct kccsrv_service *service; uint32_t periodic_startup_interval; - switch (lp_server_role(task->lp_ctx)) { + switch (lpcfg_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "kccsrv: no KCC required in standalone configuration", false); return; @@ -217,9 +217,9 @@ static void kccsrv_task_init(struct task_server *task) return; } - periodic_startup_interval = lp_parm_int(task->lp_ctx, NULL, "kccsrv", + periodic_startup_interval = lpcfg_parm_int(task->lp_ctx, NULL, "kccsrv", "periodic_startup_interval", 15); /* in seconds */ - service->periodic.interval = lp_parm_int(task->lp_ctx, NULL, "kccsrv", + service->periodic.interval = lpcfg_parm_int(task->lp_ctx, NULL, "kccsrv", "periodic_interval", 300); /* in seconds */ status = kccsrv_periodic_schedule(service, periodic_startup_interval); |