diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-11-29 11:24:08 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-12-01 17:00:47 +1100 |
| commit | c5bea98ddb2f7967df572160f639da3cba381a87 (patch) | |
| tree | e5ca502195932ea7674f03a732fc26dd5427553d /source4/kdc | |
| parent | 9c84f987acb5ffc97a612839e13e8b8042e6120e (diff) | |
| download | samba-c5bea98ddb2f7967df572160f639da3cba381a87.tar.gz samba-c5bea98ddb2f7967df572160f639da3cba381a87.tar.bz2 samba-c5bea98ddb2f7967df572160f639da3cba381a87.zip | |
s4:heimdal: import lorikeet-heimdal-201012010201 (commit 81fe27bcc0148d410ca4617f8759b9df1a5e935c)
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/hdb-samba4.c | 16 | ||||
| -rw-r--r-- | source4/kdc/kdc.c | 11 |
2 files changed, 6 insertions, 21 deletions
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c index 596e73e023..771b2edd5e 100644 --- a/source4/kdc/hdb-samba4.c +++ b/source4/kdc/hdb-samba4.c @@ -96,21 +96,6 @@ static krb5_error_code hdb_samba4_fetch_kvno(krb5_context context, HDB *db, return samba_kdc_fetch(context, kdc_db_ctx, principal, flags, kvno, entry_ex); } -static krb5_error_code hdb_samba4_fetch(krb5_context context, HDB *db, - krb5_const_principal principal, - unsigned flags, - hdb_entry_ex *entry_ex) -{ - struct samba_kdc_db_context *kdc_db_ctx; - - flags &= ~HDB_F_KVNO_SPECIFIED; - - kdc_db_ctx = talloc_get_type_abort(db->hdb_db, - struct samba_kdc_db_context); - - return samba_kdc_fetch(context, kdc_db_ctx, principal, flags, 0, entry_ex); -} - static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsigned flags, hdb_entry_ex *entry) { @@ -200,7 +185,6 @@ NTSTATUS hdb_samba4_create_kdc(struct samba_kdc_base_context *base_ctx, (*db)->hdb_dbc = NULL; (*db)->hdb_open = hdb_samba4_open; (*db)->hdb_close = hdb_samba4_close; - (*db)->hdb_fetch = hdb_samba4_fetch; (*db)->hdb_fetch_kvno = hdb_samba4_fetch_kvno; (*db)->hdb_store = hdb_samba4_store; (*db)->hdb_remove = hdb_samba4_remove; diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index d39e616e7e..99b0711592 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -631,11 +631,12 @@ static NTSTATUS kdc_check_generic_kerberos(struct irpc_message *msg, return NT_STATUS_NO_MEMORY; } - ret = kdc->config->db[0]->hdb_fetch(kdc->smb_krb5_context->krb5_context, - kdc->config->db[0], - principal, - HDB_F_GET_KRBTGT | HDB_F_DECRYPT, - &ent); + ret = kdc->config->db[0]->hdb_fetch_kvno(kdc->smb_krb5_context->krb5_context, + kdc->config->db[0], + principal, + HDB_F_GET_KRBTGT | HDB_F_DECRYPT, + 0, + &ent); if (ret != 0) { hdb_free_entry(kdc->smb_krb5_context->krb5_context, &ent); |