From dd3a9bed33eab86f32063db6fcdd43728adcc487 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Sat, 28 Jan 2006 18:47:48 +0000 Subject: [PATCH] Bug 143859. Fix linking keys problem. --- CASA.changes | 5 +++++ c_micasad/verbs/ObjectSerialization.cs | 5 +++-- c_micasad/verbs/WriteBinaryKey.cs | 5 +++-- c_micasad/verbs/WriteKey.cs | 5 +++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CASA.changes b/CASA.changes index 121cf838..41aa1190 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 28 11:46:59 MST 2006 - jnorman@novell.com + +- Bug 143859. Fix linking keys problem. + ------------------------------------------------------------------- Fri Jan 27 10:34:59 MST 2006 - cmashayekhi@novell.com diff --git a/c_micasad/verbs/ObjectSerialization.cs b/c_micasad/verbs/ObjectSerialization.cs index 9e130b7f..411cf2ca 100644 --- a/c_micasad/verbs/ObjectSerialization.cs +++ b/c_micasad/verbs/ObjectSerialization.cs @@ -431,7 +431,8 @@ namespace sscs.verbs if (targetSecret != null) { // get target key value - string targetkv = targetSecret.GetKeyValue(linkedInfo.GetLinkedKeyID()).GetValue(); + string targetKey = linkedInfo.GetLinkedKeyID(); + string targetkv = targetSecret.GetKeyValue(targetKey).GetValue(); // if a change is required in the target, then call this method recursively using the TargetSecret if (!targetkv.Equals(valStr)) @@ -441,7 +442,7 @@ namespace sscs.verbs targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr); // now call the traget to change it's linked ones - ChangeLinkedKeys(keyChain, targetSecret, key, valStr); + ChangeLinkedKeys(keyChain, targetSecret, targetKey, valStr); } } diff --git a/c_micasad/verbs/WriteBinaryKey.cs b/c_micasad/verbs/WriteBinaryKey.cs index af58ddb5..58bf4060 100644 --- a/c_micasad/verbs/WriteBinaryKey.cs +++ b/c_micasad/verbs/WriteBinaryKey.cs @@ -284,7 +284,8 @@ namespace sscs.verbs if (targetSecret != null) { // get target key value - string targetkv = targetSecret.GetKeyValue(linkedInfo.GetLinkedKeyID()).GetValue(); + string targetKey = linkedInfo.GetLinkedKeyID(); + string targetkv = targetSecret.GetKeyValue(targetKey).GetValue(); // if a change is required in the target, then call this method recursively using the TargetSecret if (!targetkv.Equals(valStr)) @@ -294,7 +295,7 @@ namespace sscs.verbs targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr); // now call the traget to change it's linked ones - ChangeLinkedKeys(keyChain, targetSecret, key, valStr); + ChangeLinkedKeys(keyChain, targetSecret, targetKey, valStr); } } } diff --git a/c_micasad/verbs/WriteKey.cs b/c_micasad/verbs/WriteKey.cs index 3c1aba24..dc8a0f54 100644 --- a/c_micasad/verbs/WriteKey.cs +++ b/c_micasad/verbs/WriteKey.cs @@ -284,7 +284,8 @@ namespace sscs.verbs if (targetSecret != null) { // get target key value - string targetkv = targetSecret.GetKeyValue(linkedInfo.GetLinkedKeyID()).GetValue(); + string targetKey = linkedInfo.GetLinkedKeyID(); + string targetkv = targetSecret.GetKeyValue(targetKey).GetValue(); // if a change is required in the target, then call this method recursively using the TargetSecret if (!targetkv.Equals(valStr)) @@ -294,7 +295,7 @@ namespace sscs.verbs targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr); // now call the traget to change it's linked ones - ChangeLinkedKeys(keyChain, targetSecret, key, valStr); + ChangeLinkedKeys(keyChain, targetSecret, targetKey, valStr); } } }