Finished making changes for the non-persistent key feature.

This commit is contained in:
Juan Carlos Luciani 2007-02-14 17:57:33 +00:00
parent b03293da31
commit 3c32748c2e
2 changed files with 15 additions and 3 deletions

View File

@ -793,6 +793,10 @@ namespace sscs.lss
{ {
string sKey = (string)etor.Key; string sKey = (string)etor.Key;
KeyValue kv = secret.GetKeyValue(sKey); KeyValue kv = secret.GetKeyValue(sKey);
if (!kv.IsPersistent)
{
continue;
}
string value = kv.GetValue(); string value = kv.GetValue();
writer.WriteStartElement(XmlConsts.keyNode); writer.WriteStartElement(XmlConsts.keyNode);
@ -804,7 +808,7 @@ namespace sscs.lss
writer.WriteStartElement(XmlConsts.keyValueNode); writer.WriteStartElement(XmlConsts.keyValueNode);
if (kv.IsPersistent && bSaveValues) if (bSaveValues)
{ {
if (kv.GetValueType() == KeyValue.VALUE_TYPE_BINARY) if (kv.GetValueType() == KeyValue.VALUE_TYPE_BINARY)
{ {

View File

@ -162,8 +162,16 @@ namespace sscs.verbs
} }
else else
{ {
secret = keyChain.GetSecret(secretId); secret = keyChain.GetSecret(secretId);
val = secret.GetKeyValue(key).GetValueAsBytes(); KeyValue kv = secret.GetKeyValue(key);
if (kv != null)
{
val = kv.GetValueAsBytes();
}
else
{
retCode = IPCRetCodes.SSCS_E_SECRETID_DOES_NOT_EXIST;
}
} }
} }
else else