diff options
| author | Nathaniel McCallum <npmccallum@redhat.com> | 2012-10-23 15:08:26 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-10-23 22:27:45 -0400 |
| commit | 83b4ecd20e50ad330cd761977d5dadefe30a785b (patch) | |
| tree | e00fb41319db6e2f3ead22ec56d416f2f038166c /src/kdc/kdc_preauth.c | |
| parent | 0e6cd4de33c401b2911a5001dc476d11bfb969a3 (diff) | |
| download | krb5-83b4ecd20e50ad330cd761977d5dadefe30a785b.zip krb5-83b4ecd20e50ad330cd761977d5dadefe30a785b.tar.gz krb5-83b4ecd20e50ad330cd761977d5dadefe30a785b.tar.bz2 | |
Add loop() kdcpreauth method
[ghudson@mit.edu: avoid verto.h header dependency; minor fixes]
ticket: 7426 (new)
target_version: 1.11
tags: pullup
Diffstat (limited to 'src/kdc/kdc_preauth.c')
| -rw-r--r-- | src/kdc/kdc_preauth.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c index 19998d8..29485a3 100644 --- a/src/kdc/kdc_preauth.c +++ b/src/kdc/kdc_preauth.c @@ -98,6 +98,7 @@ typedef struct preauth_system_st { krb5_kdcpreauth_verify_fn verify_padata; krb5_kdcpreauth_return_fn return_padata; krb5_kdcpreauth_free_modreq_fn free_modreq; + krb5_kdcpreauth_loop_fn loop; } preauth_system; static void @@ -251,7 +252,7 @@ get_plugin_vtables(krb5_context context, if (vtables == NULL) goto cleanup; for (pl = plugins, n_tables = 0; *pl != NULL; pl++) { - if ((*pl)(context, 1, 1, (krb5_plugin_vtable)&vtables[n_tables]) == 0) + if ((*pl)(context, 1, 2, (krb5_plugin_vtable)&vtables[n_tables]) == 0) n_tables++; } for (i = 0, n_systems = 0; i < n_tables; i++) { @@ -285,7 +286,8 @@ get_realm_names(struct server_handle *handle, const char ***list_out) } void -load_preauth_plugins(struct server_handle *handle, krb5_context context) +load_preauth_plugins(struct server_handle *handle, krb5_context context, + verto_ctx *ctx) { krb5_error_code ret; struct krb5_kdcpreauth_vtable_st *vtables = NULL, *vt; @@ -327,6 +329,20 @@ load_preauth_plugins(struct server_handle *handle, krb5_context context) continue; } } + + if (vt->loop) { + ret = vt->loop(context, moddata, ctx); + if (ret) { + emsg = krb5_get_error_message(context, ret); + krb5_klog_syslog(LOG_ERR, _("preauth %s failed to setup " + "loop: %s"), vt->name, emsg); + krb5_free_error_message(context, emsg); + if (vt->fini) + vt->fini(context, moddata); + continue; + } + } + /* Add this module to the systems list once for each pa type. */ for (j = 0; vt->pa_type_list[j] > 0; j++) { sys = &preauth_systems[n_systems]; @@ -341,6 +357,7 @@ load_preauth_plugins(struct server_handle *handle, krb5_context context) sys->verify_padata = vt->verify; sys->return_padata = vt->return_padata; sys->free_modreq = vt->free_modreq; + sys->loop = vt->loop; n_systems++; } } |