diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-29 18:00:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:31 -0500 |
| commit | 60a1046c5c5783799bd64fe18e03534670f83d82 (patch) | |
| tree | 48f788a6a6fbed5af0a3f3eea1e4373d70b03e5b /source4/dsdb | |
| parent | 98038f71a7b072912c974d131012335ca22c5259 (diff) | |
| download | samba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.gz samba-60a1046c5c5783799bd64fe18e03534670f83d82.tar.bz2 samba-60a1046c5c5783799bd64fe18e03534670f83d82.zip | |
r25430: Add the loadparm context to all parametric options.
(This used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58)
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/repl/drepl_service.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index f4ee5445f9..e56e2e179c 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -165,8 +165,8 @@ static void dreplsrv_task_init(struct task_server *task) return; } - periodic_startup_interval = lp_parm_int(NULL, "dreplsrv", "periodic_startup_interval", 15); /* in seconds */ - service->periodic.interval = lp_parm_int(NULL, "dreplsrv", "periodic_interval", 300); /* in seconds */ + periodic_startup_interval = lp_parm_int(global_loadparm, NULL, "dreplsrv", "periodic_startup_interval", 15); /* in seconds */ + service->periodic.interval = lp_parm_int(global_loadparm, NULL, "dreplsrv", "periodic_interval", 300); /* in seconds */ status = dreplsrv_periodic_schedule(service, periodic_startup_interval); if (!W_ERROR_IS_OK(status)) { diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index 5f4317a646..646aab9c94 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/dsdb/samdb/ldb_modules/password_hash.c @@ -341,7 +341,7 @@ static int setup_primary_kerberos(struct setup_password_fields_io *io, return LDB_ERR_OPERATIONS_ERROR; } - if (lp_parm_bool(NULL, "password_hash", "create_aes_key", false)) { + if (lp_parm_bool(global_loadparm, NULL, "password_hash", "create_aes_key", false)) { /* * TODO: * |