From a7e5c1137043cf3ba16164fd3529ef8f870879c9 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Wed, 21 Dec 2005 21:02:23 +0000 Subject: [PATCH] Bug 140056. Commented code to prevent login hangs in NDK. --- CASA.changes | 5 +++++ c_micasad/common/CSSSLogger.cs | 19 +++++++++++++++---- c_micasadk/sscs_ndk.c | 5 ++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/CASA.changes b/CASA.changes index d1fa4509..66e86faa 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 21 14:17:38 MST 2005 - jnorman@novell.com + +- Bug 140056. Commented code to prevent login hangs in NDK. + ------------------------------------------------------------------- Tue Dec 20 11:17:38 MST 2005 - jnorman@novell.com diff --git a/c_micasad/common/CSSSLogger.cs b/c_micasad/common/CSSSLogger.cs index 92fb4562..739b5357 100644 --- a/c_micasad/common/CSSSLogger.cs +++ b/c_micasad/common/CSSSLogger.cs @@ -99,7 +99,11 @@ namespace sscs.common message.Append(" Executing Path: "); message.Append(type.ToString()); message.Append(":"); - message.Append(sf.GetMethod().ToString()); + if (sf != null) + message.Append(sf.GetMethod().ToString()); + else + message.Append("Method unknown"); + log( ConstStrings.DEBUG,message.ToString() ); #endif } @@ -125,7 +129,10 @@ namespace sscs.common message.Append(" Executing Path: "); message.Append(type.ToString()); message.Append(":"); - message.Append(sf.GetMethod().ToString()); + if (sf != null) + message.Append(sf.GetMethod().ToString()); + else + message.Append("Method Unknown"); log( ConstStrings.DEBUG,message.ToString() ); #endif } @@ -152,8 +159,12 @@ namespace sscs.common message.Append(" Executing Path: "); message.Append(type.ToString()); message.Append("::"); - message.Append(sf.GetMethod().ToString()); - return message.ToString(); + if (sf != null) + message.Append(sf.GetMethod().ToString()); + else + message.Append("Method unknown"); + + return message.ToString(); } diff --git a/c_micasadk/sscs_ndk.c b/c_micasadk/sscs_ndk.c index 9913a975..ce00c21c 100644 --- a/c_micasadk/sscs_ndk.c +++ b/c_micasadk/sscs_ndk.c @@ -2709,6 +2709,7 @@ miCASAGetCredential store.version = 1; context = miCASAOpenSecretStoreCache(&store, ssFlags, NULL); + /* if (*credentialType == SSCS_CRED_TYPE_BINARY_F) { // first check appSecretID @@ -2745,6 +2746,7 @@ miCASAGetCredential miCASACloseSecretStoreCache(context, ssFlags, NULL); return rcode; } + */ // create a SHS Handle secretHandle = miCASA_CreateSHSHandle(); @@ -2925,7 +2927,7 @@ miCASASetCredential sscs_Utf8Strcpy(kc.keychainID, SSCS_SESSION_KEY_CHAIN_ID); kc.len = SSCS_S_KC_ID_CHARS; - +/* if (credentialType == SSCS_CRED_TYPE_BINARY_F) { binaryCred = (SSCS_BINARY_CREDENTIAL *)credential; @@ -2951,6 +2953,7 @@ miCASASetCredential } else +*/ basicCred = (SSCS_BASIC_CREDENTIAL *)credential;