diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-04-10 02:57:33 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-04-10 02:57:33 +0000 |
| commit | 4bb50a0a01a30beb6d4cd5bdb1bc5bc7a41c67a2 (patch) | |
| tree | 6c24348bc9e230d4fcbb3e235cb8bd7432f21f54 /src/lib/krb5/krb/gic_pwd.c | |
| parent | 8293cd3b60d9acc46a3213bbc1c6cc856abbff0c (diff) | |
| download | krb5-4bb50a0a01a30beb6d4cd5bdb1bc5bc7a41c67a2.zip krb5-4bb50a0a01a30beb6d4cd5bdb1bc5bc7a41c67a2.tar.gz krb5-4bb50a0a01a30beb6d4cd5bdb1bc5bc7a41c67a2.tar.bz2 | |
kfree.c (krb5_free_sam_challenge, krb5_free_sam_challenge_contents,
krb5_free_sam_response, krb5_free_sam_response_contents,
krb5_free_predicted_sam_response,
krb5_free_predicted_sam_response_contents,
krb5_free_enc_sam_response_enc,
krb5_free_enc_sam_response_enc_contents, krb5_free_pa_enc_ts): Added
new functions. Part of patches from [krb5-kdc/662]
gic_pwd.c (krb5_get_init_creds_password): Add new argument to calls to
the prompter function. Part of patches from [krb5-kdc/662].
preauth2.c (pa_enc_timestamp, pa_sam): Update calls to new prompter
function. [krb5-kdc/662].
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11349 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/gic_pwd.c')
| -rw-r--r-- | src/lib/krb5/krb/gic_pwd.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c index c517062..1706bce 100644 --- a/src/lib/krb5/krb/gic_pwd.c +++ b/src/lib/krb5/krb/gic_pwd.c @@ -38,7 +38,7 @@ krb5_get_as_key_password(context, client, etype, prompter, prompter_data, if (prompter == NULL) return(EIO); - if (ret = krb5_unparse_name(context, client, &clientstr)) + if ((ret = krb5_unparse_name(context, client, &clientstr))) return(ret); strcpy(promptstr, "Password for "); @@ -51,12 +51,13 @@ krb5_get_as_key_password(context, client, etype, prompter, prompter_data, prompt.hidden = 1; prompt.reply = password; - if (ret = ((*prompter)(context, prompter_data, NULL, 1, &prompt))) + if (ret = (((*prompter)(context, prompter_data, NULL, NULL, + 1, &prompt)))) return(ret); } if ((salt->length == -1) && (salt->data == NULL)) { - if (ret = krb5_principal2salt(context, client, &defsalt)) + if ((ret = krb5_principal2salt(context, client, &defsalt))) return(ret); salt = &defsalt; @@ -179,11 +180,11 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data, krb5_get_init_creds_opt_set_forwardable(&chpw_opts, 0); krb5_get_init_creds_opt_set_proxiable(&chpw_opts, 0); - if (ret = krb5_get_init_creds(context, &chpw_creds, client, - prompter, data, - start_time, "kadmin/changepw", &chpw_opts, - krb5_get_as_key_password, (void *) &pw0, - &master, NULL)) + if ((ret = krb5_get_init_creds(context, &chpw_creds, client, + prompter, data, + start_time, "kadmin/changepw", &chpw_opts, + krb5_get_as_key_password, (void *) &pw0, + &master, NULL))) goto cleanup; prompt[0].prompt = "Enter new password"; @@ -200,7 +201,7 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data, pw0.length = sizeof(pw0array); pw1.length = sizeof(pw1array); - if (ret = ((*prompter)(context, data, banner, + if (ret = ((*prompter)(context, data, 0, banner, sizeof(prompt)/sizeof(prompt[0]), prompt))) goto cleanup; @@ -215,9 +216,9 @@ krb5_get_init_creds_password(context, creds, client, password, prompter, data, krb5_data code_string; krb5_data result_string; - if (ret = krb5_change_password(context, &chpw_creds, pw0array, - &result_code, &code_string, - &result_string)) + if ((ret = krb5_change_password(context, &chpw_creds, pw0array, + &result_code, &code_string, + &result_string))) goto cleanup; /* the change succeeded. go on */ @@ -296,7 +297,7 @@ cleanup: hours/24); /* ignore an error here */ - (*prompter)(context, data, banner, 0, 0); + (*prompter)(context, data, 0, banner, 0, 0); } } |