pull up r25385 from trunk

 ------------------------------------------------------------------------
 r25385 | ghudson | 2011-10-20 11:16:03 -0400 (Thu, 20 Oct 2011) | 9 lines

 ticket: 6988
 subject: Fix handling of null edata method in KDC preauth
 target_version: 1.10
 tags: pullup

 Correctly include an empty padata value if a KDC preauth system has no
 get_edata method.  This bug prevented the KDC from indicating FAST
 support in preauth-required errors.

ticket: 6988
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25389 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
index bf1017f529128bbd55ad61e57451de38f78feacb..272980db5a855519102dcfa400604a14ef57221c 100644 (file)
--- a/src/kdc/kdc_preauth.c
+++ b/src/kdc/kdc_preauth.c
@@ -829,7 +829,7 @@ hint_list_next(struct hint_state *state)
         ap->get_edata(kdc_context, state->request, &callbacks, state->rock,
                       ap->moddata, ap->type, finish_get_edata, state);
     } else
-        finish_get_edata(state, ap->type, NULL);
+        finish_get_edata(state, 0, NULL);
     return;
 
 next: