From: Tom Yu <tlyu@mit.edu>
Date: Thu, 9 Aug 2007 22:13:56 +0000 (+0000)
Subject: pull up r19747 from trunk
X-Git-Tag: kfw-3.2.1-beta1~6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bfd6bda0373edba970525d9241b09fc4eb02c309;p=krb5.git

pull up r19747 from trunk

 r19747@cathode-dark-space:  jaltman | 2007-08-03 09:22:23 -0400
 ticket: new
 subject: NIM: apply does not update saved values of general identities cfg page
 component: windows

 The general identities configuration panel failed to update the saved values
 of the DefaultMonitor, DefaultAllowAutoRenew, and DefaultSticky options after
 the "Apply" button was pressed.  This resulted in the subsequent value changed
 states being incorrect.

 This patch saves the values.


ticket: 5623
version_fixed: 1.6.3

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

diff --git a/src/windows/identity/ui/cfg_identities_wnd.c b/src/windows/identity/ui/cfg_identities_wnd.c
index ebe61e14d..5e3079224 100644
--- a/src/windows/identity/ui/cfg_identities_wnd.c
+++ b/src/windows/identity/ui/cfg_identities_wnd.c
@@ -494,19 +494,19 @@ write_params_idents(void) {
         if (cfg_idents.work.monitor != cfg_idents.saved.monitor) {
             khc_write_int32(csp_cw, L"DefaultMonitor",
                             !!cfg_idents.work.monitor);
-            cfg_idents.work.monitor = cfg_idents.saved.monitor;
+            cfg_idents.saved.monitor = cfg_idents.work.monitor;
             cfg_idents.applied = TRUE;
         }
         if (cfg_idents.work.auto_renew != cfg_idents.saved.auto_renew) {
             khc_write_int32(csp_cw, L"DefaultAllowAutoRenew",
                             !!cfg_idents.work.auto_renew);
-            cfg_idents.work.auto_renew = cfg_idents.saved.auto_renew;
+            cfg_idents.saved.auto_renew = cfg_idents.work.auto_renew;
             cfg_idents.applied = TRUE;
         }
         if (cfg_idents.work.sticky != cfg_idents.saved.sticky) {
             khc_write_int32(csp_cw, L"DefaultSticky",
                             !!cfg_idents.work.sticky);
-            cfg_idents.work.sticky = cfg_idents.saved.sticky;
+            cfg_idents.saved.sticky = cfg_idents.work.sticky;
             cfg_idents.applied = TRUE;
         }