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

Find and Replace feature added. Resolve conflicts on Import added.

Browse Source
This commit is contained in:
Jim Norman
2006-11-06 06:50:24 +00:00
parent 6fd86d6b98
commit 18646f81b2
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CASA/sharp/NSSCSWrapper/NativeCalls.cs
View File

@@ -931,10 +931,14 @@ namespace Novell.CASA
keyChainID.keychainID = sKeyChainID;
keyChainID.len = sKeyChainID.Length + 1;
SSCS_PASSWORD_T epPassword = new SSCS_PASSWORD_T();
SSCS_PASSWORD_T epPassword = null;
if (sEPPassword != null)
{
epPassword = new SSCS_PASSWORD_T();
epPassword.pword = sEPPassword;
epPassword.pwordLen = (uint)sEPPassword.Length + 1;
epPassword.pwordType = 0; // todo set type
}
SSCS_SH_SECRET_ID_T secretID = new SSCS_SH_SECRET_ID_T();
secretID.name = sSecretID;
@@ -951,7 +955,7 @@ namespace Novell.CASA
ssFlags,
secretID,
epPassword,
ext);
null);
return rcode;
@@ -984,7 +988,8 @@ namespace Novell.CASA
if (USE_OBJECT_SERIALIZATION)
{
sc = (StringCollection)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_SECRETIDS, null, null, null, sc);
//sc = (StringCollection)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_SECRETIDS, null, null, null, sc);
sc = (StringCollection)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_SECRETIDS, sKeyChainID, null, null, sc);
return sc;
}
else

4
CASA/sharp/NSSCSWrapper/SecretStore.cs
View File

@@ -36,6 +36,8 @@ namespace Novell.CASA
private static string SESSION_KEY_CHAIN = "SSCS_SESSION_KEY_CHAIN_ID";
public static string LOCAL_REMOTE_KEY_CHAIN = "SSCS_LOCAL_REMOTE_KEY_CHAIN_ID";
public static string SSCS_CONFLICT_KEYCHAIN = "SSCS_CONFLICT_KEYCHAIN_ID";
private NativeCalls m_NativeCalls = null;
private IntPtr m_hsc = IntPtr.Zero;
@@ -72,7 +74,7 @@ namespace Novell.CASA
*/
internal Secret getSecret(string sKeyChainID, uint ssFlags, string sSecretID, int iSecretType, string sEPPassword)
public Secret getSecret(string sKeyChainID, uint ssFlags, string sSecretID, int iSecretType, string sEPPassword)
{
if (m_NativeCalls != null)
return m_NativeCalls.getSecret(m_hsc, sKeyChainID, ssFlags, sSecretID, iSecretType, sEPPassword);