diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-07-06 21:53:23 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-07-06 21:53:23 +0000 |
| commit | 8e78a7eeb7266329891971090d2666f5c6a13ad0 (patch) | |
| tree | b5d8a1827176cd1fdc9da5983181ee25c30b31b8 /src/kdc/kdc_preauth.c | |
| parent | 4a1d6a694452122f71d876e39ee335ea7ee022b6 (diff) | |
| download | krb5-8e78a7eeb7266329891971090d2666f5c6a13ad0.tar.gz krb5-8e78a7eeb7266329891971090d2666f5c6a13ad0.tar.xz krb5-8e78a7eeb7266329891971090d2666f5c6a13ad0.zip | |
Remove count parameters from get_principal, put_principal,
free_principal, delete_principal, and get_policy. Make get_principal
allocate the DB entry container. Fold krb5_db_get_principal_ext into
krb5_db_get_principal.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24175 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc/kdc_preauth.c')
| -rw-r--r-- | src/kdc/kdc_preauth.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index d754edcf41..4c413d07e8 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -2081,9 +2081,7 @@ get_sam_edata(krb5_context context, krb5_kdc_req *request, */ { - int npr = 1; - krb5_boolean more; - krb5_db_entry assoc; + krb5_db_entry *assoc; krb5_key_data *assoc_key; krb5_principal newp; int probeslot; @@ -2105,9 +2103,8 @@ get_sam_edata(krb5_context context, krb5_kdc_req *request, krb5_princ_component(kdc_context,newp,probeslot)->data = sam_ptr->name; krb5_princ_component(kdc_context,newp,probeslot)->length = strlen(sam_ptr->name); - npr = 1; - retval = get_principal(kdc_context, newp, &assoc, &npr, &more); - if(!retval && npr) { + retval = krb5_db_get_principal(kdc_context, newp, 0, &assoc); + if(retval == 0) { sc.sam_type = sam_ptr->sam_type; break; } @@ -2123,8 +2120,8 @@ get_sam_edata(krb5_context context, krb5_kdc_req *request, if (sc.sam_type) { /* so use assoc to get the key out! */ { - if ((retval = krb5_dbe_find_mkey(context, master_keylist, &assoc, - &mkey_ptr))) { + if ((retval = krb5_dbe_find_mkey(context, master_keylist, + assoc, &mkey_ptr))) { krb5_keylist_node *tmp_mkey_list; /* try refreshing the mkey list in case it's been updated */ if (krb5_db_fetch_mkey_list(context, master_princ, @@ -2133,7 +2130,7 @@ get_sam_edata(krb5_context context, krb5_kdc_req *request, krb5_dbe_free_key_list(context, master_keylist); master_keylist = tmp_mkey_list; if ((retval = krb5_dbe_find_mkey(context, master_keylist, - &assoc, &mkey_ptr))) { + assoc, &mkey_ptr))) { return (retval); } } else { @@ -2142,7 +2139,7 @@ get_sam_edata(krb5_context context, krb5_kdc_req *request, } /* here's what do_tgs_req does */ - retval = krb5_dbe_find_enctype(kdc_context, &assoc, + retval = krb5_dbe_find_enctype(kdc_context, assoc, ENCTYPE_DES_CBC_RAW, KRB5_KDB_SALTTYPE_NORMAL, 0, /* Get highest kvno */ |