oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Hidden field of hx509 prompter is removed.

Browse Source 
Fix a warning.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17554 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-05-12 10:17:19 +00:00
parent f86b0321a6
commit 7785a29dbf
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/krb5/pkinit.c
View File

@@ -1324,13 +1324,21 @@ hx_pass_prompter(void *data, const hx509_prompt *prompter)
password_data.data = prompter->reply.data; password_data.data = prompter->reply.data;
password_data.length = prompter->reply.length; password_data.length = prompter->reply.length;
prompt.prompt = "Enter your private key passphrase: ";
prompt.hidden = 1; prompt.prompt = prompter->prompt;
prompt.hidden = hx509_prompt_hidden(prompter->type);
prompt.reply = &password_data; prompt.reply = &password_data;
if (prompter->hidden)
switch (prompter->type) {
case HX509_PROMPT_TYPE_INFO:
prompt.type = KRB5_PROMPT_TYPE_INFO;
break;
case HX509_PROMPT_TYPE_PASSWORD:
case HX509_PROMPT_TYPE_QUESTION:
default:
prompt.type = KRB5_PROMPT_TYPE_PASSWORD; prompt.type = KRB5_PROMPT_TYPE_PASSWORD;
else break;
prompt.type = KRB5_PROMPT_TYPE_PREAUTH; /* XXX */ }
ret = (*p->prompter)(p->context, p->prompter_data, NULL, NULL, 1, &prompt); ret = (*p->prompter)(p->context, p->prompter_data, NULL, NULL, 1, &prompt);
if (ret) { if (ret) {
@@ -1778,6 +1786,7 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
{ {
#ifdef PKINIT #ifdef PKINIT
krb5_error_code ret; krb5_error_code ret;
char *anchors = NULL;
if (opt->opt_private == NULL) { if (opt->opt_private == NULL) {
krb5_set_error_string(context, "PKINIT: on non extendable opt"); krb5_set_error_string(context, "PKINIT: on non extendable opt");
@@ -1811,10 +1820,12 @@ krb5_get_init_creds_opt_set_pkinit(krb5_context context,
"pkinit-revoke", "pkinit-revoke",
NULL); NULL);
if (x509_anchors == NULL) if (x509_anchors == NULL) {
krb5_appdefault_string(context, "kinit", krb5_appdefault_string(context, "kinit",
krb5_principal_get_realm(context, principal), krb5_principal_get_realm(context, principal),
"pkinit-anchors", NULL, &x509_anchors); "pkinit-anchors", NULL, &anchors);
x509_anchors = anchors;
}
ret = _krb5_pk_load_id(context, ret = _krb5_pk_load_id(context,
&opt->opt_private->pk_init_ctx->id, &opt->opt_private->pk_init_ctx->id,