From: Tom Yu <tlyu@mit.edu>
Date: Mon, 1 Oct 2007 23:54:09 +0000 (+0000)
Subject: pull up r20030 from trunk
X-Git-Tag: krb5-1.6.3-beta2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ea8cd03148a0c9bee60e43633344d9844b7bc09;p=krb5.git

pull up r20030 from trunk

 r20030@cathode-dark-space:  jaltman | 2007-10-01 01:25:34 -0400
 ticket: new
 subject: NIM: BUG: APP: identity data corruption

 The credentials display in Network Identity Manager uses a cached set
 of properties for each identity that has credentials.  The existing
 code used the wrong field of the khui_credwnd_identity structure to
 store the credentials type name associated with an identity, resulting
 in a corrupt data structure.

 This patch fixes the code to use the correct field.


ticket: 5795
version_fixed: 1.6.3

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

diff --git a/src/windows/identity/ui/credwnd.c b/src/windows/identity/ui/credwnd.c
index a77ea24f3..e58786363 100644
--- a/src/windows/identity/ui/credwnd.c
+++ b/src/windows/identity/ui/credwnd.c
@@ -963,7 +963,7 @@ cw_credset_iter_func(khm_handle cred, void * rock) {
 
             cb = sizeof(cwi->credtype_name);
             if (KHM_FAILED(kcdb_identity_get_attr(ident, KCDB_ATTR_TYPE_NAME, NULL,
-                                                  &cwi->credtype, &cb))) {
+                                                  &cwi->credtype_name, &cb))) {
                 cb = sizeof(cwi->credtype_name);
                 kcdb_credtype_describe(cwi->credtype, cwi->credtype_name,
                                        &cb, KCDB_TS_SHORT);