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

Bug 140056. Commented code to prevent login hangs in NDK.

Browse Source
This commit is contained in:
Jim Norman 2005-12-21 21:02:23 +00:00
parent daf881aa7c
commit a7e5c11370
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CASA.changes
View File

@ -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 Tue Dec 20 11:17:38 MST 2005 - jnorman@novell.com

19
c_micasad/common/CSSSLogger.cs
View File

@ -99,7 +99,11 @@ namespace sscs.common
message.Append(" Executing Path: "); message.Append(" Executing Path: ");
message.Append(type.ToString()); message.Append(type.ToString());
message.Append(":"); 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() ); log( ConstStrings.DEBUG,message.ToString() );
#endif #endif
} }
@ -125,7 +129,10 @@ namespace sscs.common
message.Append(" Executing Path: "); message.Append(" Executing Path: ");
message.Append(type.ToString()); message.Append(type.ToString());
message.Append(":"); 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() ); log( ConstStrings.DEBUG,message.ToString() );
#endif #endif
} }
@ -152,8 +159,12 @@ namespace sscs.common
message.Append(" Executing Path: "); message.Append(" Executing Path: ");
message.Append(type.ToString()); message.Append(type.ToString());
message.Append("::"); message.Append("::");
message.Append(sf.GetMethod().ToString()); if (sf != null)
return message.ToString(); message.Append(sf.GetMethod().ToString());
else
message.Append("Method unknown");
return message.ToString();
} }

5
c_micasadk/sscs_ndk.c
View File

@ -2709,6 +2709,7 @@ miCASAGetCredential
store.version = 1; store.version = 1;
context = miCASAOpenSecretStoreCache(&store, ssFlags, NULL); context = miCASAOpenSecretStoreCache(&store, ssFlags, NULL);
/*
if (*credentialType == SSCS_CRED_TYPE_BINARY_F) if (*credentialType == SSCS_CRED_TYPE_BINARY_F)
{ {
// first check appSecretID // first check appSecretID
@ -2745,6 +2746,7 @@ miCASAGetCredential
miCASACloseSecretStoreCache(context, ssFlags, NULL); miCASACloseSecretStoreCache(context, ssFlags, NULL);
return rcode; return rcode;
} }
*/
// create a SHS Handle // create a SHS Handle
secretHandle = miCASA_CreateSHSHandle(); secretHandle = miCASA_CreateSHSHandle();
@ -2925,7 +2927,7 @@ miCASASetCredential
sscs_Utf8Strcpy(kc.keychainID, SSCS_SESSION_KEY_CHAIN_ID); sscs_Utf8Strcpy(kc.keychainID, SSCS_SESSION_KEY_CHAIN_ID);
kc.len = SSCS_S_KC_ID_CHARS; kc.len = SSCS_S_KC_ID_CHARS;
/*
if (credentialType == SSCS_CRED_TYPE_BINARY_F) if (credentialType == SSCS_CRED_TYPE_BINARY_F)
{ {
binaryCred = (SSCS_BINARY_CREDENTIAL *)credential; binaryCred = (SSCS_BINARY_CREDENTIAL *)credential;
@ -2951,6 +2953,7 @@ miCASASetCredential
} }
else else
*/
basicCred = (SSCS_BASIC_CREDENTIAL *)credential; basicCred = (SSCS_BASIC_CREDENTIAL *)credential;