Browse files

ticket: 7060

subject: Convert securid module edata method
target_version: 1.10
tags: pullup

r25348 made modified the edata method of the kdcpreauth interface to
be async-capable, but neglected to convert the securid_sam2 module's
edata function.  Do that now.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25621 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information...
1 parent 1bbe0d5 commit 9fff645b857ab26ccb6a2ba012b0a9cf98162812 ghudson committed Jan 7, 2012
Showing with 9 additions and 4 deletions.
  1. +9 −4 src/plugins/preauth/securid_sam2/securid_sam2_main.c
View
13 src/plugins/preauth/securid_sam2/securid_sam2_main.c
@@ -112,10 +112,11 @@ sam_get_db_entry(krb5_context context, krb5_principal client,
}
}
-static krb5_error_code
+static void
kdc_include_padata(krb5_context context, krb5_kdc_req *request,
krb5_kdcpreauth_callbacks cb, krb5_kdcpreauth_rock rock,
- krb5_kdcpreauth_moddata moddata, krb5_pa_data *pa_data)
+ krb5_kdcpreauth_moddata moddata, krb5_preauthtype pa_type,
+ krb5_kdcpreauth_edata_respond_fn respond, void *arg)
{
krb5_error_code retval;
krb5_keyblock *client_key = NULL;
@@ -124,6 +125,7 @@ kdc_include_padata(krb5_context context, krb5_kdc_req *request,
int sam_type = 0; /* unknown */
krb5_db_entry *sam_db_entry = NULL, *client;
krb5_data *encoded_challenge = NULL;
+ krb5_pa_data *pa_data = NULL;
memset(&sc2, 0, sizeof(sc2));
memset(&sc2b, 0, sizeof(sc2b));
@@ -134,7 +136,7 @@ kdc_include_padata(krb5_context context, krb5_kdc_req *request,
retval = sam_get_db_entry(context, client->princ, &sam_type,
&sam_db_entry);
if (retval)
- return retval;
+ goto cleanup;
retval = cb->client_keys(context, rock, &client_key);
if (retval)
goto cleanup;
@@ -170,6 +172,9 @@ kdc_include_padata(krb5_context context, krb5_kdc_req *request,
goto cleanup;
}
+ pa_data = k5alloc(sizeof(*pa_data), &retval);
+ if (pa_data == NULL)
+ goto cleanup;
pa_data->magic = KV5M_PA_DATA;
pa_data->pa_type = KRB5_PADATA_SAM_CHALLENGE_2;
pa_data->contents = (krb5_octet *) encoded_challenge->data;
@@ -189,7 +194,7 @@ kdc_include_padata(krb5_context context, krb5_kdc_req *request,
if (sam_db_entry)
krb5_db_free_principal(context, sam_db_entry);
cb->free_keys(context, rock, client_key);
- return retval;
+ (*respond)(arg, retval, pa_data);
}
static void

0 comments on commit 9fff645

Please sign in to comment.