diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2008-10-17 17:05:31 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2008-10-17 17:05:31 +0000 |
| commit | ad00bd79992a656fc93a3345b23dc932ec020bcc (patch) | |
| tree | 364051364fe00230716ee4e0c6ef6e150c05eb1a | |
| parent | 4a8d023b50d4b2cb521f0a47e7b8b71e50586fe0 (diff) | |
| download | krb5-ad00bd79992a656fc93a3345b23dc932ec020bcc.tar.gz krb5-ad00bd79992a656fc93a3345b23dc932ec020bcc.tar.xz krb5-ad00bd79992a656fc93a3345b23dc932ec020bcc.zip | |
Treat unreadable terminal as user cancelled so regression tests work
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20883 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/kim/lib/kim_ui_cli.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/kim/lib/kim_ui_cli.c b/src/kim/lib/kim_ui_cli.c index 922f386ee..0bb5eebbb 100644 --- a/src/kim/lib/kim_ui_cli.c +++ b/src/kim/lib/kim_ui_cli.c @@ -73,7 +73,9 @@ static kim_error kim_ui_cli_read_string (kim_string *out_string, prompts[0].reply->length = sizeof (reply_string); err = krb5_prompter_posix (k5context, NULL, NULL, NULL, 1, prompts); - if (err == KRB5_LIBOS_PWDINTR) { err = check_error (KIM_USER_CANCELED_ERR); } + if (err == KRB5_LIBOS_PWDINTR || err == KRB5_LIBOS_CANTREADPWD) { + err = check_error (KIM_USER_CANCELED_ERR); + } } if (!err) { @@ -228,7 +230,9 @@ kim_error kim_ui_cli_auth_prompt (kim_ui_context *in_context, if (!err) { err = krb5_prompter_posix (k5context, in_context, in_title, in_message, 1, prompts); - if (err == KRB5_LIBOS_PWDINTR) { err = check_error (KIM_USER_CANCELED_ERR); } + if (err == KRB5_LIBOS_PWDINTR || err == KRB5_LIBOS_CANTREADPWD) { + err = check_error (KIM_USER_CANCELED_ERR); + } } if (!err) { @@ -376,6 +380,11 @@ kim_error kim_ui_cli_change_password (kim_ui_context *in_context, 1, enter_old_password_format, identity_string); + if (!err && strlen (old_password) < 1) { + /* Empty password: Synthesize bad password err */ + err = KRB5KRB_AP_ERR_BAD_INTEGRITY; + } + if (!err) { err = kim_credential_create_for_change_password ((kim_credential *) &in_context->tcontext, in_identity, @@ -387,7 +396,7 @@ kim_error kim_ui_cli_change_password (kim_ui_context *in_context, if (err && err != KIM_USER_CANCELED_ERR) { /* new creds failed, report error to user */ err = kim_ui_handle_kim_error (in_context, in_identity, - kim_ui_error_type_authentication, + kim_ui_error_type_change_password, err); } else { |