diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-25 17:19:03 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-25 17:19:03 +1100 |
| commit | 54bd30f70632b8fcbe164133d2479092b7262a29 (patch) | |
| tree | 588c4019f409b8234a15a53959d908cc9695e606 /source4/dsdb | |
| parent | b55a5adab99f535bb392662d54afbabed116a3b6 (diff) | |
| download | samba-54bd30f70632b8fcbe164133d2479092b7262a29.tar.gz samba-54bd30f70632b8fcbe164133d2479092b7262a29.tar.bz2 samba-54bd30f70632b8fcbe164133d2479092b7262a29.zip | |
s4-samdb: reduce the number of samdb opens at startup
Using common parameters means that the ldb_wrap code can return a
reference rather than a new database
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/kcc/kcc_service.c | 9 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_service.c | 9 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb_privilege.c | 13 |
3 files changed, 8 insertions, 23 deletions
diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c index 32e09ac989..b088d2ed89 100644 --- a/source4/dsdb/kcc/kcc_service.c +++ b/source4/dsdb/kcc/kcc_service.c @@ -40,12 +40,9 @@ */ static WERROR kccsrv_init_creds(struct kccsrv_service *service) { - NTSTATUS status; - - status = auth_system_session_info(service, service->task->lp_ctx, - &service->system_session_info); - if (!NT_STATUS_IS_OK(status)) { - return ntstatus_to_werror(status); + service->system_session_info = system_session(service->task->lp_ctx); + if (!service->system_session_info) { + return WERR_NOMEM; } return WERR_OK; diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c index 34853c85f9..a05ccc8d70 100644 --- a/source4/dsdb/repl/drepl_service.c +++ b/source4/dsdb/repl/drepl_service.c @@ -35,12 +35,9 @@ static WERROR dreplsrv_init_creds(struct dreplsrv_service *service) { - NTSTATUS status; - - status = auth_system_session_info(service, service->task->lp_ctx, - &service->system_session_info); - if (!NT_STATUS_IS_OK(status)) { - return ntstatus_to_werror(status); + service->system_session_info = system_session(service->task->lp_ctx); + if (service->system_session_info == NULL) { + return WERR_NOMEM; } return WERR_OK; diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c index dcb96d8c0e..81b9381b22 100644 --- a/source4/dsdb/samdb/samdb_privilege.c +++ b/source4/dsdb/samdb/samdb_privilege.c @@ -33,17 +33,8 @@ struct ldb_context *privilege_connect(TALLOC_CTX *mem_ctx, struct tevent_context *ev_ctx, struct loadparm_context *lp_ctx) { - char *path; - struct ldb_context *pdb; - - path = private_path(mem_ctx, lp_ctx, "privilege.ldb"); - if (!path) return NULL; - - pdb = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, path, - NULL, NULL, 0); - talloc_free(path); - - return pdb; + return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, "privilege.ldb", + NULL, NULL, 0); } /* |