diff options
| author | Justin Anderson <jander@mit.edu> | 2008-10-01 14:00:16 +0000 |
|---|---|---|
| committer | Justin Anderson <jander@mit.edu> | 2008-10-01 14:00:16 +0000 |
| commit | 2531824d63b20f8d59c5f2c844327aed3873cbcb (patch) | |
| tree | 4beb097c761f0b0e91e61a5ad53f4073a6c4a85d /src | |
| parent | 16afa8ffad45c84aad9a3905be566a8d13130c63 (diff) | |
| download | krb5-2531824d63b20f8d59c5f2c844327aed3873cbcb.tar.gz krb5-2531824d63b20f8d59c5f2c844327aed3873cbcb.tar.xz krb5-2531824d63b20f8d59c5f2c844327aed3873cbcb.zip | |
kim_selection_hints_get_identity should call kim_ui_fini even when kim_ui_select_identity returns an error, e.g. KIM_USER_CANCELED_ERR
ticket: 6055
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20791 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kim/lib/kim_selection_hints.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/kim/lib/kim_selection_hints.c b/src/kim/lib/kim_selection_hints.c index 6bfa3f182..70dacd75f 100644 --- a/src/kim/lib/kim_selection_hints.c +++ b/src/kim/lib/kim_selection_hints.c @@ -465,8 +465,10 @@ kim_error kim_selection_hints_get_identity (kim_selection_hints in_selection_hi &identity); } - if (!err) { - err = kim_ui_fini (&context); + if (context.initialized) { + kim_error terr = KIM_NO_ERROR; + terr = kim_ui_fini (&context); + err = (terr != KIM_NO_ERROR) ? terr : err; } } |
