diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-04 00:12:03 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:58 +0100 |
commit | fc2f06d31b6b52c5cbd83f34a34e5107649a5134 (patch) | |
tree | 5ecd763c0af159cfab5f5e0654aed621857f4361 /source4/kdc | |
parent | 785928dcecf12c9cf2250ff4e9868232d4faa88c (diff) | |
download | samba-fc2f06d31b6b52c5cbd83f34a34e5107649a5134.tar.gz samba-fc2f06d31b6b52c5cbd83f34a34e5107649a5134.tar.bz2 samba-fc2f06d31b6b52c5cbd83f34a34e5107649a5134.zip |
r26274: Some syntax fixes, remove more global_loadparm instances.
(This used to be commit 3809113d86dbd35b906356a05bb481a1e2bfe4b7)
Diffstat (limited to 'source4/kdc')
-rw-r--r-- | source4/kdc/hdb-ldb.c | 4 | ||||
-rw-r--r-- | source4/kdc/kdc.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index 672086a786..95a6b502a4 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -1103,6 +1103,7 @@ static krb5_error_code LDB_destroy(krb5_context context, HDB *db) * code */ NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, + struct loadparm_context *lp_ctx, krb5_context context, struct HDB **db, const char *arg) { NTSTATUS nt_status; @@ -1164,7 +1165,8 @@ krb5_error_code hdb_ldb_create(krb5_context context, struct HDB **db, const char { NTSTATUS nt_status; /* The global kdc_mem_ctx, Disgusting, ugly hack, but it means one less private hook */ - nt_status = kdc_hdb_ldb_create(kdc_mem_ctx, context, db, arg); + nt_status = kdc_hdb_ldb_create(kdc_mem_ctx, global_loadparm, + context, db, arg); if (NT_STATUS_IS_OK(nt_status)) { return 0; diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index da19d3be26..2aa9ddd22e 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -609,7 +609,8 @@ static void kdc_task_init(struct task_server *task) } kdc->config->num_db = 1; - status = kdc_hdb_ldb_create(kdc, kdc->smb_krb5_context->krb5_context, + status = kdc_hdb_ldb_create(kdc, task->lp_ctx, + kdc->smb_krb5_context->krb5_context, &kdc->config->db[0], NULL); if (!NT_STATUS_IS_OK(status)) { task_server_terminate(task, "kdc: hdb_ldb_create (setup KDC database) failed"); |