geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 143859. Fix linking keys problem.

Browse Source
This commit is contained in:
Jim Norman
2006-01-28 18:47:48 +00:00
parent c91f6e198d
commit dd3a9bed33
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CASA.changes
View File

@@ -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 Fri Jan 27 10:34:59 MST 2006 - cmashayekhi@novell.com

5
c_micasad/verbs/ObjectSerialization.cs
View File

@@ -431,7 +431,8 @@ namespace sscs.verbs
if (targetSecret != null) if (targetSecret != null)
{ {
// get target key value // 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 a change is required in the target, then call this method recursively using the TargetSecret
if (!targetkv.Equals(valStr)) if (!targetkv.Equals(valStr))
@@ -441,7 +442,7 @@ namespace sscs.verbs
targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr); targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr);
// now call the traget to change it's linked ones // now call the traget to change it's linked ones
ChangeLinkedKeys(keyChain, targetSecret, key, valStr); ChangeLinkedKeys(keyChain, targetSecret, targetKey, valStr);
} }
} }

5
c_micasad/verbs/WriteBinaryKey.cs
View File

@@ -284,7 +284,8 @@ namespace sscs.verbs
if (targetSecret != null) if (targetSecret != null)
{ {
// get target key value // 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 a change is required in the target, then call this method recursively using the TargetSecret
if (!targetkv.Equals(valStr)) if (!targetkv.Equals(valStr))
@@ -294,7 +295,7 @@ namespace sscs.verbs
targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr); targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr);
// now call the traget to change it's linked ones // now call the traget to change it's linked ones
ChangeLinkedKeys(keyChain, targetSecret, key, valStr); ChangeLinkedKeys(keyChain, targetSecret, targetKey, valStr);
} }
} }
} }

5
c_micasad/verbs/WriteKey.cs
View File

@@ -284,7 +284,8 @@ namespace sscs.verbs
if (targetSecret != null) if (targetSecret != null)
{ {
// get target key value // 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 a change is required in the target, then call this method recursively using the TargetSecret
if (!targetkv.Equals(valStr)) if (!targetkv.Equals(valStr))
@@ -294,7 +295,7 @@ namespace sscs.verbs
targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr); targetSecret.SetKeyValue(linkedInfo.GetLinkedKeyID(), valStr);
// now call the traget to change it's linked ones // now call the traget to change it's linked ones
ChangeLinkedKeys(keyChain, targetSecret, key, valStr); ChangeLinkedKeys(keyChain, targetSecret, targetKey, valStr);
} }
} }
} }