fixup logic for prompting for password

This commit is contained in:
Love Hörnquist Åstrand
2012-03-10 09:59:34 -08:00
parent d791e70894
commit 7b411b3993

View File

@@ -2472,18 +2472,17 @@ krb5_get_init_creds_password(krb5_context context,
if (prompter != NULL && ctx->password == NULL && password == NULL) { if (prompter != NULL && ctx->password == NULL && password == NULL) {
krb5_prompt prompt; krb5_prompt prompt;
krb5_data password_data; krb5_data password_data;
char *p, *q; char *p, *q = NULL;
int aret = -1; int aret;
ret = krb5_unparse_name (context, client, &p); ret = krb5_unparse_name(context, client, &p);
if (!ret) { if (ret)
aret = asprintf (&q, "%s's Password: ", p); goto out;
free (p);
} aret = asprintf(&q, "%s's Password: ", p);
if (!ret || aret == -1 || !q) { free (p);
if (!ret) if (aret == -1 || q == NULL) {
ret = ENOMEM; ret = krb5_enomem(context);
krb5_clear_error_message (context);
goto out; goto out;
} }
prompt.prompt = q; prompt.prompt = q;