diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:56:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:05 +0100 |
| commit | 51db4c3f3d81d1ed03beae6426786c843ac59807 (patch) | |
| tree | d85647baa9f9715657a900da164ea54dc07fd13f /source4/dsdb | |
| parent | f4a1083cf9f64b4d2b65b68942e93861409ea90f (diff) | |
| download | samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.gz samba-51db4c3f3d81d1ed03beae6426786c843ac59807.tar.bz2 samba-51db4c3f3d81d1ed03beae6426786c843ac59807.zip | |
r26228: Store loadparm context in auth context, move more loadparm_contexts up the call stack.
(This used to be commit ba75f1613a9aac69dd5df94dd8a2b37820acd166)
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/common/sidmap.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_service.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/dsdb/common/sidmap.c b/source4/dsdb/common/sidmap.c index 8383d2b36b..97e5fb2b19 100644 --- a/source4/dsdb/common/sidmap.c +++ b/source4/dsdb/common/sidmap.c @@ -48,14 +48,14 @@ struct sidmap_context { /* open a sidmap context - use talloc_free to close */ -_PUBLIC_ struct sidmap_context *sidmap_open(TALLOC_CTX *mem_ctx) +_PUBLIC_ struct sidmap_context *sidmap_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { struct sidmap_context *sidmap; sidmap = talloc(mem_ctx, struct sidmap_context); if (sidmap == NULL) { return NULL; } - sidmap->samctx = samdb_connect(sidmap, global_loadparm, system_session(sidmap)); + sidmap->samctx = samdb_connect(sidmap, lp_ctx, system_session(sidmap)); if (sidmap->samctx == NULL) { talloc_free(sidmap); return NULL; diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index 5c74dbfb72..72033f4177 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -45,12 +45,12 @@ static WERROR dreplsrv_init_creds(struct dreplsrv_service *service) return WERR_OK; } -static WERROR dreplsrv_connect_samdb(struct dreplsrv_service *service) +static WERROR dreplsrv_connect_samdb(struct dreplsrv_service *service, struct loadparm_context *lp_ctx) { const struct GUID *ntds_guid; struct drsuapi_DsBindInfo28 *bind_info28; - service->samdb = samdb_connect(service, global_loadparm, service->system_session_info); + service->samdb = samdb_connect(service, lp_ctx, service->system_session_info); if (!service->samdb) { return WERR_DS_SERVICE_UNAVAILABLE; } @@ -118,7 +118,7 @@ static void dreplsrv_task_init(struct task_server *task) struct dreplsrv_service *service; uint32_t periodic_startup_interval; - switch (lp_server_role(global_loadparm)) { + switch (lp_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "dreplsrv: no DSDB replication required in standalone configuration"); return; @@ -149,7 +149,7 @@ static void dreplsrv_task_init(struct task_server *task) return; } - status = dreplsrv_connect_samdb(service); + status = dreplsrv_connect_samdb(service, task->lp_ctx); if (!W_ERROR_IS_OK(status)) { task_server_terminate(task, talloc_asprintf(task, "dreplsrv: Failed to connect to local samdb: %s\n", @@ -165,8 +165,8 @@ static void dreplsrv_task_init(struct task_server *task) return; } - 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 */ + 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 */ status = dreplsrv_periodic_schedule(service, periodic_startup_interval); if (!W_ERROR_IS_OK(status)) { |