From: Justin Anderson <jander@mit.edu>
Date: Wed, 1 Oct 2008 14:00:16 +0000 (+0000)
Subject: kim_selection_hints_get_identity should call kim_ui_fini even when kim_ui_select_iden... 
X-Git-Tag: krb5-1.7-alpha1~380
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2531824d63b20f8d59c5f2c844327aed3873cbcb;p=krb5.git

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
---

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;
         }
     }