diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 15:53:28 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:29 +0100 |
| commit | 43696d2752e2faad34fb3ed2a7dbf01d40ffdc46 (patch) | |
| tree | d16b58eca5fc3294f4b1d1d7a7bf287cdec333d8 /source4/kdc | |
| parent | 7b38aa728eb722cd14fa0ad4e246df0d2e54faba (diff) | |
| download | samba-43696d2752e2faad34fb3ed2a7dbf01d40ffdc46.tar.gz samba-43696d2752e2faad34fb3ed2a7dbf01d40ffdc46.tar.bz2 samba-43696d2752e2faad34fb3ed2a7dbf01d40ffdc46.zip | |
r26252: Specify loadparm_context explicitly when creating sessions.
(This used to be commit 7280c1e9415daabb2712db1372e23f9846272ede)
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/hdb-ldb.c | 2 | ||||
| -rw-r--r-- | source4/kdc/kpasswdd.c | 6 | ||||
| -rw-r--r-- | source4/kdc/pac-glue.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index a7c5e4b3fb..672086a786 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -1116,7 +1116,7 @@ NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, (*db)->hdb_master_key_set = 0; (*db)->hdb_db = NULL; - nt_status = auth_system_session_info(*db, &session_info); + nt_status = auth_system_session_info(*db, global_loadparm, &session_info); if (!NT_STATUS_IS_OK(nt_status)) { return nt_status; } diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c index 35697bef4e..300fb478a8 100644 --- a/source4/kdc/kpasswdd.c +++ b/source4/kdc/kpasswdd.c @@ -180,7 +180,7 @@ static bool kpasswdd_change_password(struct kdc_server *kdc, struct samr_DomInfo1 *dominfo; struct ldb_context *samdb; - samdb = samdb_connect(mem_ctx, global_loadparm, system_session(mem_ctx)); + samdb = samdb_connect(mem_ctx, kdc->task->lp_ctx, system_session(mem_ctx, kdc->task->lp_ctx)); if (!samdb) { return kpasswdd_make_error_reply(kdc, mem_ctx, KRB5_KPASSWD_HARDERROR, @@ -310,7 +310,7 @@ static bool kpasswd_process_request(struct kdc_server *kdc, krb5_free_principal(context, principal); - samdb = samdb_connect(mem_ctx, global_loadparm, session_info); + samdb = samdb_connect(mem_ctx, kdc->task->lp_ctx, session_info); if (!samdb) { return kpasswdd_make_error_reply(kdc, mem_ctx, KRB5_KPASSWD_HARDERROR, @@ -473,7 +473,7 @@ bool kpasswdd_process(struct kdc_server *kdc, /* We want the credentials subsystem to use the krb5 context * we already have, rather than a new context */ cli_credentials_set_krb5_context(server_credentials, kdc->smb_krb5_context); - cli_credentials_set_conf(server_credentials, global_loadparm); + cli_credentials_set_conf(server_credentials, kdc->task->lp_ctx); nt_status = cli_credentials_set_stored_principal(server_credentials, "kadmin/changepw"); if (!NT_STATUS_IS_OK(nt_status)) { ret = kpasswdd_make_unauth_error_reply(kdc, mem_ctx, diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c index d82718dda2..4ba1023785 100644 --- a/source4/kdc/pac-glue.c +++ b/source4/kdc/pac-glue.c @@ -28,6 +28,7 @@ #include "librpc/gen_ndr/krb5pac.h" #include "auth/auth.h" #include "auth/auth_sam.h" +#include "param/param.h" struct krb5_dh_moduli; struct _krb5_krb_auth_data; @@ -124,6 +125,7 @@ krb5_error_code samba_kdc_get_pac(void *priv, } nt_status = authsam_make_server_info(mem_ctx, private->samdb, + lp_netbios_name(global_loadparm), private->msg, private->realm_ref_msg, data_blob(NULL, 0), |