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 a77ea24f3b762ed141b2690d69b8ed0ca44a4e05..e58786363a72b3369ebbe59f4513331c1e9779df 100644 (file)
--- 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);