From: Tom Yu <tlyu@mit.edu>
Date: Fri, 30 Mar 2007 00:35:31 +0000 (+0000)
Subject: pull up r19124 from trunk
X-Git-Tag: kfw-3.2.0-beta1~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11c71012de28ca77c9cd21af17672e9e40c006d1;p=krb5.git

pull up r19124 from trunk

 r19124@cathode-dark-space:  jaltman | 2007-01-30 06:22:45 -0500
 ticket: 5414

 	The fix for the command line race conditions
 	broke the ability to cancel and restart the
 	Obtain New Credentials dialog



ticket: 5414
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19324 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/identity/ui/credfuncs.c b/src/windows/identity/ui/credfuncs.c
index 470af4f26..e70b8526e 100644
--- a/src/windows/identity/ui/credfuncs.c
+++ b/src/windows/identity/ui/credfuncs.c
@@ -367,7 +367,7 @@ kmsg_cred_completion(kmq_message *m)
         /* all is done. */
         {
             khui_new_creds * nc;
-            khm_boolean continue_cmdline = FALSE;
+            khm_boolean continue_cmdline = TRUE;
 
             nc = (khui_new_creds *) m->vparam;
 
@@ -380,6 +380,7 @@ kmsg_cred_completion(kmq_message *m)
                 */
 
                 khm_cred_end_dialog(nc);
+
             } else if (nc->subtype == KMSG_CRED_RENEW_CREDS) {
 
                 /* if this is a renewal that was triggered while we
@@ -390,8 +391,8 @@ kmsg_cred_completion(kmq_message *m)
                     LONG renewals;
                     renewals = InterlockedDecrement(&khm_startup.pending_renewals);
 
-                    if (renewals == 0) {
-                        continue_cmdline = TRUE;
+                    if (renewals != 0) {
+                        continue_cmdline = FALSE;
                     }
                 }
             }