diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-10-23 21:25:38 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-10-23 21:25:38 -0400 |
| commit | e9d6e7ef606cf5ea70e2cc2f35dd91861ab00092 (patch) | |
| tree | fe62feb6612a3414393ab5b63920aecfe958dba7 /src/lib | |
| parent | 820a0a455a5ddcccf89eddf3a7ee555b8ac4b943 (diff) | |
| download | krb5-e9d6e7ef606cf5ea70e2cc2f35dd91861ab00092.tar.gz krb5-e9d6e7ef606cf5ea70e2cc2f35dd91861ab00092.tar.xz krb5-e9d6e7ef606cf5ea70e2cc2f35dd91861ab00092.zip | |
Only record real selected preauth type
Move where we record the selected preauth type so that we never record
an informational preauth type, only a real one.
ticket: 7422 (new)
target_version: 1.11
tags: pullup
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/krb/preauth2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c index b900ce42c0..23f00f3ad5 100644 --- a/src/lib/krb5/krb/preauth2.c +++ b/src/lib/krb5/krb/preauth2.c @@ -618,9 +618,6 @@ run_preauth_plugins(krb5_context kcontext, if (ret != 0) return ret; } - /* Record which pa_type we answered a call for. */ - if (preauth_rock->selected_preauth_type != NULL) - *preauth_rock->selected_preauth_type = in_padata->pa_type; break; } if (i >= kcontext->preauth_context->n_modules) { @@ -1027,6 +1024,9 @@ krb5_do_preauth(krb5_context context, krb5_kdc_req *request, &out_pa_list, &out_pa_list_size, &module_ret, opte); if (ret == 0 && module_ret == 0 && paorder[h] == PA_REAL) { + /* Record which real padata type we answered. */ + if (rock->selected_preauth_type != NULL) + *rock->selected_preauth_type = in_padata[i]->pa_type; *got_real_out = TRUE; break; } |