diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
| commit | 02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b (patch) | |
| tree | 61b9147863cd8be3eff63903dc36cae168254bd5 /src/ccapi/test | |
| parent | 162ab371748cba0cc6f172419bd6e71fa04bb878 (diff) | |
| download | krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.gz krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.xz krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.zip | |
make mark-cstyle
make reindent
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23100 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi/test')
61 files changed, 1378 insertions, 1406 deletions
diff --git a/src/ccapi/test/main.c b/src/ccapi/test/main.c index d48601003..2ace96783 100644 --- a/src/ccapi/test/main.c +++ b/src/ccapi/test/main.c @@ -11,16 +11,16 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; // cc_ccache_iterator_t cache_iterator = NULL; // cc_credentials_iterator_t cred_iterator = NULL; - + fprintf(stdout, "Testing CCAPI against CCAPI v3 rev 8 documentation...\n"); fprintf(stdout, "Warning: this test suite is woefully incomplete and unpolished.\n"); - + T_CCAPI_INIT; - + // *** ccapi v2 compat *** err = check_cc_shutdown(); err = check_cc_get_change_time(); @@ -39,9 +39,9 @@ int main (int argc, const char * argv[]) { err = check_cc_seq_fetch_creds_begin(); err = check_cc_seq_fetch_creds_next(); err = check_cc_get_NC_info(); - + err = check_constants(); - + // *** cc_context *** err = check_cc_initialize(); err = check_cc_context_release(); @@ -56,7 +56,7 @@ int main (int argc, const char * argv[]) { // err = check_cc_context_lock(); // err = check_cc_context_unlock(); err = check_cc_context_compare(); - + // *** cc_ccache *** err = check_cc_ccache_release(); err = check_cc_ccache_destroy(); @@ -77,14 +77,14 @@ int main (int argc, const char * argv[]) { err = check_cc_ccache_get_kdc_time_offset(); err = check_cc_ccache_set_kdc_time_offset(); err = check_cc_ccache_clear_kdc_time_offset(); - + // *** cc_ccache_iterator *** err = check_cc_ccache_iterator_next(); - + // *** cc_credentials_iterator *** err = check_cc_credentials_iterator_next(); - + fprintf(stdout, "\nFinished testing CCAPI. %d failure%s in total.\n", total_failure_count, (total_failure_count == 1) ? "" : "s"); - + return err; } diff --git a/src/ccapi/test/pingtest.c b/src/ccapi/test/pingtest.c index 637f8ab18..d64db2e4b 100644 --- a/src/ccapi/test/pingtest.c +++ b/src/ccapi/test/pingtest.c @@ -30,9 +30,9 @@ RPC_STATUS send_test(char* endpoint) { unsigned char* pszNetworkAddress = NULL; unsigned char* pszOptions = NULL; unsigned char* pszStringBinding = NULL; - unsigned char* pszUuid = NULL; + unsigned char* pszUuid = NULL; RPC_STATUS status; - + status = RpcStringBindingCompose(pszUuid, (RPC_CSTR)"ncalrpc", pszNetworkAddress, @@ -73,7 +73,7 @@ int main( int argc, char *argv[]) { char* message = "Hello, RPC!"; - if ((dwTlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; + if ((dwTlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; // send_test("krbcc.229026.0.ep"); @@ -90,14 +90,14 @@ int main( int argc, char *argv[]) { } if (!err) { - err = cci_os_ipc_msg(TRUE, send_stream, CCMSG_PING, &reply_stream); + err = cci_os_ipc_msg(TRUE, send_stream, CCMSG_PING, &reply_stream); } Sleep(10*1000); cci_debug_printf("Try finishing async call."); Sleep(INFINITE); cci_debug_printf("main: return. err == %d", err); - + return 0; } diff --git a/src/ccapi/test/simple_lock_test.c b/src/ccapi/test/simple_lock_test.c index 418d56ad0..8961d9999 100644 --- a/src/ccapi/test/simple_lock_test.c +++ b/src/ccapi/test/simple_lock_test.c @@ -1,6 +1,6 @@ /* simple_lock_test.c - + Initializes two contexts in two different threads and tries to get read locks on both at the same time. Hangs at line 24. */ @@ -25,7 +25,7 @@ void *other_thread (void) { cc_int32 err; cc_context_t context = NULL; - + err = cc_initialize(&context, ccapi_version_7, NULL, NULL); log_error("thread: attempting lock. may hang. err == %d", err); @@ -57,7 +57,7 @@ int main (int argc, char *argv[]) { if (!err) { err = cc_context_lock(context, cc_lock_read, cc_lock_noblock); } - + log_error("main: initialized and read locked context. err == %d", err); #ifdef TARGET_OS_MAC @@ -71,9 +71,9 @@ int main (int argc, char *argv[]) { #else #endif - + log_error("main: unlocking and releasing context. err == %d", err); - + if (context) { log_error("main: calling cc_context_unlock"); cc_context_unlock(context); @@ -83,7 +83,7 @@ int main (int argc, char *argv[]) { } log_error("main: return. err == %d", err); - + #if defined(_WIN32) UNREFERENCED_PARAMETER(status); // no whining! #endif diff --git a/src/ccapi/test/test_cc_ccache_compare.c b/src/ccapi/test/test_cc_ccache_compare.c index 6034a341d..96aaa56c7 100644 --- a/src/ccapi/test/test_cc_ccache_compare.c +++ b/src/ccapi/test/test_cc_ccache_compare.c @@ -7,7 +7,7 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_compare(); diff --git a/src/ccapi/test/test_cc_ccache_destroy.c b/src/ccapi/test/test_cc_ccache_destroy.c index 2b56f10c0..95c417ca5 100644 --- a/src/ccapi/test/test_cc_ccache_destroy.c +++ b/src/ccapi/test/test_cc_ccache_destroy.c @@ -7,7 +7,7 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_destroy(); diff --git a/src/ccapi/test/test_cc_ccache_get_change_time.c b/src/ccapi/test/test_cc_ccache_get_change_time.c index 323c66fe9..a515d5bdc 100644 --- a/src/ccapi/test/test_cc_ccache_get_change_time.c +++ b/src/ccapi/test/test_cc_ccache_get_change_time.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_get_change_time(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_get_credentials_version.c b/src/ccapi/test/test_cc_ccache_get_credentials_version.c index 7f3e71461..f5df7c078 100644 --- a/src/ccapi/test/test_cc_ccache_get_credentials_version.c +++ b/src/ccapi/test/test_cc_ccache_get_credentials_version.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_get_credentials_version(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_get_kdc_time_offset.c b/src/ccapi/test/test_cc_ccache_get_kdc_time_offset.c index 871342a10..13e61165c 100644 --- a/src/ccapi/test/test_cc_ccache_get_kdc_time_offset.c +++ b/src/ccapi/test/test_cc_ccache_get_kdc_time_offset.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_get_kdc_time_offset(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_get_last_default_time.c b/src/ccapi/test/test_cc_ccache_get_last_default_time.c index a820d1385..4de22e4a0 100644 --- a/src/ccapi/test/test_cc_ccache_get_last_default_time.c +++ b/src/ccapi/test/test_cc_ccache_get_last_default_time.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_get_last_default_time(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_get_name.c b/src/ccapi/test/test_cc_ccache_get_name.c index 77e525a31..f6649974f 100644 --- a/src/ccapi/test/test_cc_ccache_get_name.c +++ b/src/ccapi/test/test_cc_ccache_get_name.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_get_name(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_get_principal.c b/src/ccapi/test/test_cc_ccache_get_principal.c index 8e110ed01..05d7c4349 100644 --- a/src/ccapi/test/test_cc_ccache_get_principal.c +++ b/src/ccapi/test/test_cc_ccache_get_principal.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_get_principal(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_iterator_next.c b/src/ccapi/test/test_cc_ccache_iterator_next.c index ec81103d8..945a98d26 100644 --- a/src/ccapi/test/test_cc_ccache_iterator_next.c +++ b/src/ccapi/test/test_cc_ccache_iterator_next.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_iterator_next(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_move.c b/src/ccapi/test/test_cc_ccache_move.c index 37793181f..880198c89 100644 --- a/src/ccapi/test/test_cc_ccache_move.c +++ b/src/ccapi/test/test_cc_ccache_move.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_move(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_new_credentials_iterator.c b/src/ccapi/test/test_cc_ccache_new_credentials_iterator.c index cd18693d4..1338e832a 100644 --- a/src/ccapi/test/test_cc_ccache_new_credentials_iterator.c +++ b/src/ccapi/test/test_cc_ccache_new_credentials_iterator.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_new_credentials_iterator(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_release.c b/src/ccapi/test/test_cc_ccache_release.c index 4a8e685bd..75d604c91 100644 --- a/src/ccapi/test/test_cc_ccache_release.c +++ b/src/ccapi/test/test_cc_ccache_release.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_release(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_remove_credentials.c b/src/ccapi/test/test_cc_ccache_remove_credentials.c index c13a618ef..679da85c5 100644 --- a/src/ccapi/test/test_cc_ccache_remove_credentials.c +++ b/src/ccapi/test/test_cc_ccache_remove_credentials.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_remove_credentials(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_set_default.c b/src/ccapi/test/test_cc_ccache_set_default.c index 6adf3e977..71bba2a46 100644 --- a/src/ccapi/test/test_cc_ccache_set_default.c +++ b/src/ccapi/test/test_cc_ccache_set_default.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_set_default(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_set_kdc_time_offset.c b/src/ccapi/test/test_cc_ccache_set_kdc_time_offset.c index e15f246e9..b8b21e987 100644 --- a/src/ccapi/test/test_cc_ccache_set_kdc_time_offset.c +++ b/src/ccapi/test/test_cc_ccache_set_kdc_time_offset.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_set_kdc_time_offset(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_set_principal.c b/src/ccapi/test/test_cc_ccache_set_principal.c index 4cc453402..ec55acd71 100644 --- a/src/ccapi/test/test_cc_ccache_set_principal.c +++ b/src/ccapi/test/test_cc_ccache_set_principal.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_set_principal(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_ccache_store_credentials.c b/src/ccapi/test/test_cc_ccache_store_credentials.c index 53a6564c7..c52125bdb 100644 --- a/src/ccapi/test/test_cc_ccache_store_credentials.c +++ b/src/ccapi/test/test_cc_ccache_store_credentials.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_ccache_store_credentials(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_close.c b/src/ccapi/test/test_cc_close.c index b3a5bc2ef..b6bc3afaa 100644 --- a/src/ccapi/test/test_cc_close.c +++ b/src/ccapi/test/test_cc_close.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_close(); diff --git a/src/ccapi/test/test_cc_context_compare.c b/src/ccapi/test/test_cc_context_compare.c index 9b2626a5d..f4965af3a 100644 --- a/src/ccapi/test/test_cc_context_compare.c +++ b/src/ccapi/test/test_cc_context_compare.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_compare(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_create_ccache.c b/src/ccapi/test/test_cc_context_create_ccache.c index a616e1cab..c94294513 100644 --- a/src/ccapi/test/test_cc_context_create_ccache.c +++ b/src/ccapi/test/test_cc_context_create_ccache.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_create_ccache(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_create_default_ccache.c b/src/ccapi/test/test_cc_context_create_default_ccache.c index aaad4ab57..c3fb4054e 100644 --- a/src/ccapi/test/test_cc_context_create_default_ccache.c +++ b/src/ccapi/test/test_cc_context_create_default_ccache.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_create_default_ccache(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_create_new_ccache.c b/src/ccapi/test/test_cc_context_create_new_ccache.c index c77d931ff..d89fa4f3f 100644 --- a/src/ccapi/test/test_cc_context_create_new_ccache.c +++ b/src/ccapi/test/test_cc_context_create_new_ccache.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_create_new_ccache(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_get_change_time.c b/src/ccapi/test/test_cc_context_get_change_time.c index f98b2ce64..ad5c0a346 100644 --- a/src/ccapi/test/test_cc_context_get_change_time.c +++ b/src/ccapi/test/test_cc_context_get_change_time.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_get_change_time(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_get_default_ccache_name.c b/src/ccapi/test/test_cc_context_get_default_ccache_name.c index ffa8c2cbf..06fff955f 100644 --- a/src/ccapi/test/test_cc_context_get_default_ccache_name.c +++ b/src/ccapi/test/test_cc_context_get_default_ccache_name.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_get_default_ccache_name(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_new_ccache_iterator.c b/src/ccapi/test/test_cc_context_new_ccache_iterator.c index b7885de64..82209854a 100644 --- a/src/ccapi/test/test_cc_context_new_ccache_iterator.c +++ b/src/ccapi/test/test_cc_context_new_ccache_iterator.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_new_ccache_iterator(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_open_ccache.c b/src/ccapi/test/test_cc_context_open_ccache.c index 8e7e825b9..461d8df63 100644 --- a/src/ccapi/test/test_cc_context_open_ccache.c +++ b/src/ccapi/test/test_cc_context_open_ccache.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_open_ccache(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_open_default_ccache.c b/src/ccapi/test/test_cc_context_open_default_ccache.c index e6e72fa62..09c6b7c39 100644 --- a/src/ccapi/test/test_cc_context_open_default_ccache.c +++ b/src/ccapi/test/test_cc_context_open_default_ccache.c @@ -7,10 +7,9 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_open_default_ccache(); return err; } -
\ No newline at end of file diff --git a/src/ccapi/test/test_cc_context_release.c b/src/ccapi/test/test_cc_context_release.c index 5510ab961..03faf233d 100644 --- a/src/ccapi/test/test_cc_context_release.c +++ b/src/ccapi/test/test_cc_context_release.c @@ -7,7 +7,7 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_context_release(); diff --git a/src/ccapi/test/test_cc_create.c b/src/ccapi/test/test_cc_create.c index d591d47be..a21c44334 100644 --- a/src/ccapi/test/test_cc_create.c +++ b/src/ccapi/test/test_cc_create.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_create(); diff --git a/src/ccapi/test/test_cc_credentials_iterator_next.c b/src/ccapi/test/test_cc_credentials_iterator_next.c index 5ae961154..beed791b8 100644 --- a/src/ccapi/test/test_cc_credentials_iterator_next.c +++ b/src/ccapi/test/test_cc_credentials_iterator_next.c @@ -7,7 +7,7 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_credentials_iterator_next(); diff --git a/src/ccapi/test/test_cc_destroy.c b/src/ccapi/test/test_cc_destroy.c index 13eae7b00..e55a83788 100644 --- a/src/ccapi/test/test_cc_destroy.c +++ b/src/ccapi/test/test_cc_destroy.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_destroy(); diff --git a/src/ccapi/test/test_cc_get_NC_info.c b/src/ccapi/test/test_cc_get_NC_info.c index fe72cbe35..6b8eb3748 100644 --- a/src/ccapi/test/test_cc_get_NC_info.c +++ b/src/ccapi/test/test_cc_get_NC_info.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_get_NC_info(); diff --git a/src/ccapi/test/test_cc_get_change_time.c b/src/ccapi/test/test_cc_get_change_time.c index 8b031c1a3..d2058fec5 100644 --- a/src/ccapi/test/test_cc_get_change_time.c +++ b/src/ccapi/test/test_cc_get_change_time.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_get_change_time(); diff --git a/src/ccapi/test/test_cc_get_cred_version.c b/src/ccapi/test/test_cc_get_cred_version.c index 865abf00f..1ff86781e 100644 --- a/src/ccapi/test/test_cc_get_cred_version.c +++ b/src/ccapi/test/test_cc_get_cred_version.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_get_cred_version(); diff --git a/src/ccapi/test/test_cc_get_name.c b/src/ccapi/test/test_cc_get_name.c index b4efa40fc..5b6e1462a 100644 --- a/src/ccapi/test/test_cc_get_name.c +++ b/src/ccapi/test/test_cc_get_name.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_get_name(); diff --git a/src/ccapi/test/test_cc_get_principal.c b/src/ccapi/test/test_cc_get_principal.c index f0078561d..a809e5d12 100644 --- a/src/ccapi/test/test_cc_get_principal.c +++ b/src/ccapi/test/test_cc_get_principal.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_get_principal(); diff --git a/src/ccapi/test/test_cc_initialize.c b/src/ccapi/test/test_cc_initialize.c index bf2fcdc26..1669a29a3 100644 --- a/src/ccapi/test/test_cc_initialize.c +++ b/src/ccapi/test/test_cc_initialize.c @@ -7,7 +7,7 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_initialize(); diff --git a/src/ccapi/test/test_cc_open.c b/src/ccapi/test/test_cc_open.c index d3253d8a3..83bb60201 100644 --- a/src/ccapi/test/test_cc_open.c +++ b/src/ccapi/test/test_cc_open.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_open(); diff --git a/src/ccapi/test/test_cc_remove_cred.c b/src/ccapi/test/test_cc_remove_cred.c index 121ad1b52..6f841bbc0 100644 --- a/src/ccapi/test/test_cc_remove_cred.c +++ b/src/ccapi/test/test_cc_remove_cred.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_remove_cred(); diff --git a/src/ccapi/test/test_cc_seq_fetch_NCs_begin.c b/src/ccapi/test/test_cc_seq_fetch_NCs_begin.c index 0d08e9151..329ca26ed 100644 --- a/src/ccapi/test/test_cc_seq_fetch_NCs_begin.c +++ b/src/ccapi/test/test_cc_seq_fetch_NCs_begin.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_seq_fetch_NCs_begin(); diff --git a/src/ccapi/test/test_cc_seq_fetch_NCs_next.c b/src/ccapi/test/test_cc_seq_fetch_NCs_next.c index c941fd4fe..31b5ac07c 100644 --- a/src/ccapi/test/test_cc_seq_fetch_NCs_next.c +++ b/src/ccapi/test/test_cc_seq_fetch_NCs_next.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_seq_fetch_NCs_next(); diff --git a/src/ccapi/test/test_cc_seq_fetch_creds_begin.c b/src/ccapi/test/test_cc_seq_fetch_creds_begin.c index 16c0a72cb..5bb5e9164 100644 --- a/src/ccapi/test/test_cc_seq_fetch_creds_begin.c +++ b/src/ccapi/test/test_cc_seq_fetch_creds_begin.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_seq_fetch_creds_begin(); diff --git a/src/ccapi/test/test_cc_seq_fetch_creds_next.c b/src/ccapi/test/test_cc_seq_fetch_creds_next.c index eaaf451c4..83528b30e 100644 --- a/src/ccapi/test/test_cc_seq_fetch_creds_next.c +++ b/src/ccapi/test/test_cc_seq_fetch_creds_next.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_seq_fetch_creds_next(); diff --git a/src/ccapi/test/test_cc_set_principal.c b/src/ccapi/test/test_cc_set_principal.c index bfe9162bf..04b55df9e 100644 --- a/src/ccapi/test/test_cc_set_principal.c +++ b/src/ccapi/test/test_cc_set_principal.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_set_principal(); diff --git a/src/ccapi/test/test_cc_shutdown.c b/src/ccapi/test/test_cc_shutdown.c index 31c3d7c57..8756ca9f3 100644 --- a/src/ccapi/test/test_cc_shutdown.c +++ b/src/ccapi/test/test_cc_shutdown.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_shutdown(); diff --git a/src/ccapi/test/test_cc_store.c b/src/ccapi/test/test_cc_store.c index 7edc77715..507b36120 100644 --- a/src/ccapi/test/test_cc_store.c +++ b/src/ccapi/test/test_cc_store.c @@ -6,7 +6,7 @@ #include "test_ccapi_v2.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_cc_store(); diff --git a/src/ccapi/test/test_ccapi_ccache.c b/src/ccapi/test/test_ccapi_ccache.c index 64a70e3c2..a0fd84af1 100644 --- a/src/ccapi/test/test_ccapi_ccache.c +++ b/src/ccapi/test/test_ccapi_ccache.c @@ -1,4 +1,3 @@ - #include <string.h> #include <stdlib.h> #include <errno.h> @@ -15,69 +14,69 @@ int check_cc_ccache_release(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_release"); - + #ifndef cc_ccache_release log_error("cc_ccache_release is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } - - - + + + if (!err) { check_once_cc_ccache_release(context, ccache, ccNoError, NULL); ccache = NULL; } - + if (context) { cc_context_release(context); } - + #endif /* cc_ccache_release */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_release(cc_context_t context, cc_ccache_t ccache, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; - + cc_int32 possible_return_values[2] = { - ccNoError, - ccErrInvalidCCache, + ccNoError, + ccErrInvalidCCache, }; cc_string_t name = NULL; - + err = cc_ccache_get_name(ccache, &name); err = cc_ccache_release(ccache); ccache = NULL; - + BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_release - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err && name) { // try opening released ccache to make sure it still exists err = cc_context_open_ccache(context, name->data, &ccache); } check_if(err == ccErrCCacheNotFound, "released ccache was actually destroyed instead"); - + if (ccache) { cc_ccache_destroy(ccache); } if (name) { cc_string_release(name); } - + #endif /* cc_ccache_release */ - + END_CHECK_ONCE; - + return err; } @@ -89,69 +88,69 @@ int check_cc_ccache_destroy(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_destroy"); - + #ifndef cc_ccache_destroy log_error("cc_ccache_destroy is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } - - - + + + if (!err) { check_once_cc_ccache_destroy(context, ccache, ccNoError, NULL); ccache = NULL; } - + if (context) { cc_context_release(context); } - + #endif /* cc_ccache_destroy */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_destroy(cc_context_t context, cc_ccache_t ccache, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; - + cc_int32 possible_return_values[2] = { - ccNoError, - ccErrInvalidCCache, + ccNoError, + ccErrInvalidCCache, }; cc_string_t name = NULL; - + BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_destroy - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_get_name(ccache, &name); err = cc_ccache_destroy(ccache); ccache = NULL; - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err && name) { // try opening released ccache to make sure it still exists err = cc_context_open_ccache(context, name->data, &ccache); } check_if(err != ccErrCCacheNotFound, "destroyed ccache was actually released instead"); - + if (ccache) { cc_ccache_destroy(ccache); } if (name) { cc_string_release(name); } - + #endif /* cc_ccache_destroy */ - + END_CHECK_ONCE; - + return err; } @@ -163,16 +162,16 @@ int check_cc_ccache_set_default(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_set_default"); - + #ifndef cc_ccache_set_default log_error("cc_ccache_set_default is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + // try when it's the only ccache (already default) if (!err) { err = destroy_all_ccaches(context); @@ -187,7 +186,7 @@ int check_cc_ccache_set_default(void) { err = cc_ccache_release(ccache); ccache = NULL; } - + // try when it's not the only ccache (and not default) if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "baz@BAR.ORG", &ccache); @@ -199,8 +198,8 @@ int check_cc_ccache_set_default(void) { err = cc_ccache_release(ccache); ccache = NULL; } - - // try when it's not the only ccache (and already default) + + // try when it's not the only ccache (and already default) if (!err) { err = cc_context_open_default_ccache(context, &ccache); } @@ -211,41 +210,41 @@ int check_cc_ccache_set_default(void) { err = cc_ccache_release(ccache); ccache = NULL; } - + if (!err) { err = destroy_all_ccaches(context); } - + if (context) { cc_context_release(context); } - + #endif /* cc_ccache_set_default */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_set_default(cc_context_t context, cc_ccache_t ccache, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; - + cc_int32 possible_return_values[3] = { - ccNoError, - ccErrInvalidCCache, - ccErrCCacheNotFound, + ccNoError, + ccErrInvalidCCache, + ccErrCCacheNotFound, }; cc_ccache_t default_ccache = NULL; cc_string_t name = NULL; cc_string_t default_name = NULL; - + BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_set_default - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_set_default(ccache); // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { err = cc_ccache_get_name(ccache, &name); } @@ -261,16 +260,16 @@ cc_int32 check_once_cc_ccache_set_default(cc_context_t context, cc_ccache_t ccac else { check_if(1, "cc_ccache_get_name failed"); } - + if (default_ccache) { cc_ccache_release(default_ccache); } //if (ccache) { cc_ccache_destroy(ccache); } // ccache is released by the caller if (default_name) { cc_string_release(default_name); } if (name) { cc_string_release(name); } - + #endif /* cc_ccache_set_default */ - + END_CHECK_ONCE; - + return err; } @@ -282,16 +281,16 @@ int check_cc_ccache_get_credentials_version(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_get_credentials_version"); - + #ifndef cc_ccache_get_credentials_version log_error("cc_ccache_get_credentials_version is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + // try one created with v5 creds if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); @@ -303,7 +302,7 @@ int check_cc_ccache_get_credentials_version(void) { log_error("cc_context_create_new_ccache failed, can't complete test"); failure_count++; } - + // try it with added v4 creds if (!err) { err = cc_ccache_set_principal(ccache, cc_credentials_v4, "foo@BAR.ORG"); @@ -315,14 +314,14 @@ int check_cc_ccache_get_credentials_version(void) { log_error("cc_ccache_set_principal failed, can't complete test"); failure_count++; } - + if (ccache) { cc_ccache_destroy(ccache); ccache = NULL; } - + err = ccNoError; - + // try one created with v4 creds if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v4, "foo@BAR.ORG", &ccache); @@ -334,62 +333,62 @@ int check_cc_ccache_get_credentials_version(void) { log_error("cc_context_create_new_ccache failed, can't complete test"); failure_count++; } - + // try it with added v5 creds if (!err) { err = cc_ccache_set_principal(ccache, cc_credentials_v5, "foo@BAR.ORG"); } if (!err) { check_once_cc_ccache_get_credentials_version(ccache, cc_credentials_v4_v5, ccNoError, "v4 with v5 creds added"); - } + } else { log_error("cc_ccache_set_principal failed, can't complete test"); failure_count++; } - + if (ccache) { cc_ccache_destroy(ccache); ccache = NULL; } - + if (context) { cc_context_release(context); } - + #endif /* cc_ccache_get_credentials_version */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_get_credentials_version(cc_ccache_t ccache, cc_uint32 expected_cred_vers, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrInvalidCCache, - ccErrBadParam, - ccErrCCacheNotFound, + ccNoError, + ccErrInvalidCCache, + ccErrBadParam, + ccErrCCacheNotFound, }; cc_uint32 stored_cred_vers = 0; - + BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_get_credentials_version - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_get_credentials_version(ccache, &stored_cred_vers); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(stored_cred_vers != expected_cred_vers, NULL); } - + #endif /* cc_ccache_get_credentials_version */ - + END_CHECK_ONCE; - + return err; } @@ -401,20 +400,20 @@ int check_cc_ccache_get_name(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_get_name"); - + #ifndef cc_ccache_get_name log_error("cc_ccache_get_name is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // try with unique ccache (which happens to be default) if (!err) { err = cc_context_create_ccache(context, "0", cc_credentials_v5, "foo@BAR.ORG", &ccache); @@ -425,12 +424,12 @@ int check_cc_ccache_get_name(void) { else { log_error("cc_context_create_ccache failed, can't complete test"); failure_count++; - } + } if (ccache) { cc_ccache_release(ccache); ccache = NULL; } - + // try with unique ccache (which is not default) if (!err) { err = cc_context_create_ccache(context, "1", cc_credentials_v5, "foo@BAR.ORG", &ccache); @@ -442,7 +441,7 @@ int check_cc_ccache_get_name(void) { log_error("cc_context_create_ccache failed, can't complete test"); failure_count++; } - + // try with bad param if (!err) { check_once_cc_ccache_get_name(ccache, NULL, ccErrBadParam, "NULL param"); @@ -451,104 +450,104 @@ int check_cc_ccache_get_name(void) { cc_ccache_release(ccache); ccache = NULL; } - - if (context) { + + if (context) { err = destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_get_name */ - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_get_name(cc_ccache_t ccache, const char *expected_name, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrInvalidCCache, - ccErrBadParam, - ccErrCCacheNotFound, + ccNoError, + ccErrInvalidCCache, + ccErrBadParam, + ccErrCCacheNotFound, }; cc_string_t stored_name = NULL; - + BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_get_name - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (expected_name == NULL) { // we want to try with a NULL param err = cc_ccache_get_name(ccache, NULL); } else { err = cc_ccache_get_name(ccache, &stored_name); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(strcmp(stored_name->data, expected_name), NULL); } - + if (stored_name) { cc_string_release(stored_name); } - + #endif /* cc_ccache_get_name */ - + END_CHECK_ONCE; - + return err; } // --------------------------------------------------------------------------- -cc_int32 check_once_cc_ccache_get_principal(cc_ccache_t ccache, - cc_uint32 cred_vers, - const char *expected_principal, - cc_int32 expected_err, +cc_int32 check_once_cc_ccache_get_principal(cc_ccache_t ccache, + cc_uint32 cred_vers, + const char *expected_principal, + cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_string_t stored_principal = NULL; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrNoMem, - ccErrBadCredentialsVersion, - ccErrBadParam, - ccErrInvalidCCache, - ccErrCCacheNotFound, + ccNoError, + ccErrNoMem, + ccErrBadCredentialsVersion, + ccErrBadParam, + ccErrInvalidCCache, + ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_get_principal - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (expected_principal == NULL) { // we want to try with a NULL param err = cc_ccache_get_principal(ccache, cred_vers, NULL); } else { err = cc_ccache_get_principal(ccache, cred_vers, &stored_principal); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(strcmp(stored_principal->data, expected_principal), "expected princ == \"%s\" stored princ == \"%s\"", expected_principal, stored_principal->data); } - + if (stored_principal) { cc_string_release(stored_principal); } - + #endif /* cc_ccache_get_principal */ - + END_CHECK_ONCE; - + return err; } @@ -558,20 +557,20 @@ int check_cc_ccache_get_principal(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_get_principal"); - + #ifndef cc_ccache_get_principal log_error("cc_ccache_get_principal is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // try with krb5 principal if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo/BAR@BAZ.ORG", &ccache); @@ -587,7 +586,7 @@ int check_cc_ccache_get_principal(void) { cc_ccache_release(ccache); ccache = NULL; } - + // try with krb4 principal if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v4, "foo.BAR@BAZ.ORG", &ccache); @@ -599,29 +598,29 @@ int check_cc_ccache_get_principal(void) { log_error("cc_context_create_new_ccache failed, can't complete test"); failure_count++; } - + // try with bad param if (!err) { // cc_ccache_t doesn't have any concept of the difference between a v4 and v5 principal - check_once_cc_ccache_get_principal(ccache, cc_credentials_v4_v5, "foo.BAR@BAZ.ORG", + check_once_cc_ccache_get_principal(ccache, cc_credentials_v4_v5, "foo.BAR@BAZ.ORG", ccErrBadCredentialsVersion, "passing cc_credentials_v4_v5 (shouldn't be allowed)"); check_once_cc_ccache_get_principal(ccache, cc_credentials_v5, NULL, ccErrBadParam, "passed null out param"); } - + if (ccache) { cc_ccache_release(ccache); ccache = NULL; } - - if (context) { + + if (context) { err = destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_get_principal */ - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } // --------------------------------------------------------------------------- @@ -630,20 +629,20 @@ int check_cc_ccache_set_principal(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_set_principal"); - + #ifndef cc_ccache_set_principal log_error("cc_ccache_set_principal is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // bad params if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAZ.ORG", &ccache); @@ -660,7 +659,7 @@ int check_cc_ccache_set_principal(void) { cc_ccache_destroy(ccache); ccache = NULL; } - + // empty ccache @@ -679,7 +678,7 @@ int check_cc_ccache_set_principal(void) { cc_ccache_destroy(ccache); ccache = NULL; } - + // add v4 principal to v5 only ccache if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAZ.ORG", &ccache); @@ -711,7 +710,7 @@ int check_cc_ccache_set_principal(void) { cc_ccache_destroy(ccache); ccache = NULL; } - + // add v5 principal to v4 only ccache if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v4, "foo@BAZ.ORG", &ccache); @@ -727,66 +726,66 @@ int check_cc_ccache_set_principal(void) { cc_ccache_destroy(ccache); ccache = NULL; } - + // with credentials - + // replace v5 only ccache's principal - + // add v4 principal to v5 only ccache // replace v4 only ccache's principal - + // add v5 principal to v4 only ccache - - if (context) { + + if (context) { err = destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_set_principal */ - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_set_principal(cc_ccache_t ccache, cc_uint32 cred_vers, const char *in_principal, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_string_t stored_principal = NULL; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrNoMem, - ccErrInvalidCCache, - ccErrBadCredentialsVersion, - ccErrBadParam, - ccErrCCacheNotFound, + ccNoError, + ccErrNoMem, + ccErrInvalidCCache, + ccErrBadCredentialsVersion, + ccErrBadParam, + ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_set_principal - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_set_principal(ccache, cred_vers, in_principal); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { err = cc_ccache_get_principal(ccache, cred_vers, &stored_principal); } - + // compare stored with input if (!err) { check_if(strcmp(stored_principal->data, in_principal), "expected princ == \"%s\" stored princ == \"%s\"", in_principal, stored_principal->data); } - + if (stored_principal) { cc_string_release(stored_principal); } - + #endif /* cc_ccache_set_principal */ - + END_CHECK_ONCE; - + return err; } @@ -801,20 +800,20 @@ int check_cc_ccache_store_credentials(void) { cc_ccache_t dup_ccache = NULL; cc_credentials_union creds_union; cc_string_t name = NULL; - + BEGIN_TEST("cc_ccache_store_credentials"); - + #ifndef cc_ccache_store_credentials log_error("cc_ccache_store_credentials is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } @@ -823,21 +822,21 @@ int check_cc_ccache_store_credentials(void) { if (!err) { err = new_v5_creds_union(&creds_union, "BAR.ORG"); } - + if (!err) { check_once_cc_ccache_store_credentials(ccache, &creds_union, ccNoError, "ok creds"); } - + if (&creds_union) { release_v5_creds_union(&creds_union); } - + // try with bad params check_once_cc_ccache_store_credentials(ccache, NULL, ccErrBadParam, "NULL creds param"); - + // invalid creds if (!err) { err = new_v5_creds_union(&creds_union, "BAR.ORG"); } - + if (!err) { if (creds_union.credentials.credentials_v5->client) { free(creds_union.credentials.credentials_v5->client); @@ -845,14 +844,14 @@ int check_cc_ccache_store_credentials(void) { } check_once_cc_ccache_store_credentials(ccache, &creds_union, ccErrBadParam, "invalid creds (NULL client string)"); } - + if (&creds_union) { release_v5_creds_union(&creds_union); } - + // bad creds version if (!err) { err = new_v5_creds_union(&creds_union, "BAR.ORG"); } - + if (!err) { creds_union.version = cc_credentials_v4_v5; check_once_cc_ccache_store_credentials(ccache, &creds_union, ccErrBadCredentialsVersion, "v4_v5 creds (invalid) into a ccache with only v5 princ"); @@ -860,11 +859,11 @@ int check_cc_ccache_store_credentials(void) { check_once_cc_ccache_store_credentials(ccache, &creds_union, ccErrBadCredentialsVersion, "v4 creds into a ccache with only v5 princ"); creds_union.version = cc_credentials_v5; } - + if (&creds_union) { release_v5_creds_union(&creds_union); } - + // non-existent ccache - if (ccache) { + if (ccache) { err = cc_ccache_get_name(ccache, &name); if (!err) { err = cc_context_open_ccache(context, name->data, &dup_ccache); @@ -872,24 +871,24 @@ int check_cc_ccache_store_credentials(void) { if (name) { cc_string_release(name); } if (dup_ccache) { cc_ccache_destroy(dup_ccache); } } - + if (!err) { err = new_v5_creds_union(&creds_union, "BAR.ORG"); } - + if (!err) { check_once_cc_ccache_store_credentials(ccache, &creds_union, ccErrInvalidCCache, "invalid ccache"); } - + if (&creds_union) { release_v5_creds_union(&creds_union); } if (ccache) { cc_ccache_release(ccache); } - if (context) { + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_store_credentials */ - + END_TEST_AND_RETURN } @@ -897,27 +896,27 @@ cc_int32 check_once_cc_ccache_store_credentials(cc_ccache_t ccache, const cc_cre cc_int32 err = ccNoError; cc_credentials_iterator_t creds_iterator = NULL; cc_credentials_t creds = NULL; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrBadParam, - ccErrInvalidCCache, - ccErrInvalidCredentials, - ccErrBadCredentialsVersion, - ccErrCCacheNotFound, + ccNoError, + ccErrBadParam, + ccErrInvalidCCache, + ccErrInvalidCredentials, + ccErrBadCredentialsVersion, + ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_store_credentials - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_store_credentials(ccache, credentials); - + // check returned error check_err(err, expected_err, possible_return_values); - + // make sure credentials were truly stored if (!err) { err = cc_ccache_new_credentials_iterator(ccache, &creds_iterator); @@ -929,20 +928,20 @@ cc_int32 check_once_cc_ccache_store_credentials(cc_ccache_t ccache, const cc_cre break; } cc_credentials_release(creds); - creds = NULL; + creds = NULL; } } - - if (err == ccIteratorEnd) { + + if (err == ccIteratorEnd) { check_if((creds != NULL), "stored credentials not found in ccache"); err = ccNoError; } if (creds) { cc_credentials_release(creds); } - + #endif /* cc_ccache_store_credentials */ - + END_CHECK_ONCE; - + return err; } @@ -961,24 +960,24 @@ int check_cc_ccache_remove_credentials(void) { cc_credentials_iterator_t creds_iterator = NULL; cc_string_t name = NULL; unsigned int i; - + BEGIN_TEST("cc_ccache_remove_credentials"); - + #ifndef cc_ccache_remove_credentials log_error("cc_ccache_remove_credentials is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } - + // store 10 creds and retrieve their cc_credentials_t representations for(i = 0; !err && (i < 10); i++) { new_v5_creds_union(&creds_union, "BAR.ORG"); @@ -1000,7 +999,7 @@ int check_cc_ccache_remove_credentials(void) { } } if (err == ccIteratorEnd) { err = ccNoError; } - + // remove 10 valid creds for (i = 0; !err && (i < 8); i++) { check_once_cc_ccache_remove_credentials(ccache, creds_array[i], ccNoError, "10 ok creds"); @@ -1008,12 +1007,12 @@ int check_cc_ccache_remove_credentials(void) { // NULL param check_once_cc_ccache_remove_credentials(ccache, NULL, ccErrBadParam, "NULL creds in param"); - + // non-existent creds (remove same one twice) check_once_cc_ccache_remove_credentials(ccache, creds_array[0], ccErrInvalidCredentials, "removed same creds twice"); - + // non-existent ccache - if (ccache) { + if (ccache) { err = cc_ccache_get_name(ccache, &name); if (!err) { err = cc_context_open_ccache(context, name->data, &dup_ccache); @@ -1021,11 +1020,11 @@ int check_cc_ccache_remove_credentials(void) { if (name) { cc_string_release(name); } if (dup_ccache) { cc_ccache_destroy(dup_ccache); } } - + if (!err) { err = new_v5_creds_union(&creds_union, "BAR.ORG"); } - + if (!err) { check_once_cc_ccache_remove_credentials(ccache, creds_array[8], ccErrInvalidCCache, "invalid ccache"); } @@ -1035,13 +1034,13 @@ int check_cc_ccache_remove_credentials(void) { } if (ccache) { cc_ccache_release(ccache); } - if (context) { + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_remove_credentials */ - + END_TEST_AND_RETURN } @@ -1049,27 +1048,27 @@ cc_int32 check_once_cc_ccache_remove_credentials(cc_ccache_t ccache, cc_credenti cc_int32 err = ccNoError; cc_credentials_iterator_t creds_iterator = NULL; cc_credentials_t creds = NULL; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrBadParam, - ccErrInvalidCCache, - ccErrInvalidCredentials, - ccErrCredentialsNotFound, + ccNoError, + ccErrBadParam, + ccErrInvalidCCache, + ccErrInvalidCredentials, + ccErrCredentialsNotFound, ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_remove_credentials - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_remove_credentials(ccache, in_creds); - + // check returned error check_err(err, expected_err, possible_return_values); - + // make sure credentials were truly removed if (!err) { err = cc_ccache_new_credentials_iterator(ccache, &creds_iterator); @@ -1081,22 +1080,22 @@ cc_int32 check_once_cc_ccache_remove_credentials(cc_ccache_t ccache, cc_credenti break; } cc_credentials_release(creds); - creds = NULL; + creds = NULL; } } - - if (err == ccIteratorEnd) { + + if (err == ccIteratorEnd) { err = ccNoError; } else { check_if((creds != NULL), "credentials not removed from ccache"); } if (creds) { cc_credentials_release(creds); } - + #endif /* cc_ccache_remove_credentials */ - + END_CHECK_ONCE; - + return err; } @@ -1111,44 +1110,44 @@ int check_cc_ccache_new_credentials_iterator(void) { cc_ccache_t dup_ccache = NULL; cc_credentials_iterator_t creds_iterator = NULL; cc_string_t name = NULL; - + BEGIN_TEST("cc_ccache_new_credentials_iterator"); - + #ifndef cc_ccache_new_credentials_iterator log_error("cc_ccache_new_credentials_iterator is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } - + // valid params if (!err) { check_once_cc_ccache_new_credentials_iterator(ccache, &creds_iterator, ccNoError, "valid params"); } - if (creds_iterator) { - cc_credentials_iterator_release(creds_iterator); + if (creds_iterator) { + cc_credentials_iterator_release(creds_iterator); creds_iterator = NULL; } - + // NULL out param if (!err) { check_once_cc_ccache_new_credentials_iterator(ccache, NULL, ccErrBadParam, "NULL out iterator param"); } - if (creds_iterator) { - cc_credentials_iterator_release(creds_iterator); + if (creds_iterator) { + cc_credentials_iterator_release(creds_iterator); creds_iterator = NULL; } - + // non-existent ccache - if (ccache) { + if (ccache) { err = cc_ccache_get_name(ccache, &name); if (!err) { err = cc_context_open_ccache(context, name->data, &dup_ccache); @@ -1156,53 +1155,53 @@ int check_cc_ccache_new_credentials_iterator(void) { if (name) { cc_string_release(name); } if (dup_ccache) { cc_ccache_destroy(dup_ccache); } } - + if (!err) { check_once_cc_ccache_new_credentials_iterator(ccache, &creds_iterator, ccErrInvalidCCache, "invalid ccache"); } - - if (creds_iterator) { - cc_credentials_iterator_release(creds_iterator); + + if (creds_iterator) { + cc_credentials_iterator_release(creds_iterator); creds_iterator = NULL; } if (ccache) { cc_ccache_release(ccache); } - if (context) { + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_new_credentials_iterator */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_new_credentials_iterator(cc_ccache_t ccache, cc_credentials_iterator_t *iterator, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; - + cc_int32 possible_return_values[5] = { - ccNoError, - ccErrBadParam, - ccErrNoMem, - ccErrCCacheNotFound, - ccErrInvalidCCache, + ccNoError, + ccErrBadParam, + ccErrNoMem, + ccErrCCacheNotFound, + ccErrInvalidCCache, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_new_credentials_iterator - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_new_credentials_iterator(ccache, iterator); - + // check returned error check_err(err, expected_err, possible_return_values); - + #endif /* cc_ccache_new_credentials_iterator */ - + END_CHECK_ONCE; - + return err; } @@ -1212,38 +1211,38 @@ cc_int32 check_once_cc_ccache_new_credentials_iterator(cc_ccache_t ccache, cc_cr cc_int32 check_once_cc_ccache_get_change_time(cc_ccache_t ccache, cc_time_t *last_time, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_time_t this_time = 0; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrInvalidCCache, - ccErrBadParam, - ccErrCCacheNotFound, + ccNoError, + ccErrInvalidCCache, + ccErrBadParam, + ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_get_change_time - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (last_time == NULL) { err = cc_ccache_get_change_time(ccache, NULL); // passed NULL to compare against because intention is actually to pass bad param instead } else { err = cc_ccache_get_change_time(ccache, &this_time); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if ((!err) && last_time) { check_if(this_time <= *last_time, "change time didn't increase when expected"); *last_time = this_time; } - + #endif /* cc_ccache_get_change_time */ - + END_CHECK_ONCE; - + return err; } @@ -1258,20 +1257,20 @@ int check_cc_ccache_get_change_time(void) { cc_credentials_iterator_t creds_iterator = NULL; cc_credentials_t credentials = NULL; cc_time_t last_time = 0; - + BEGIN_TEST("cc_ccache_get_change_time"); - + #ifndef cc_ccache_get_change_time log_error("cc_ccache_get_change_time is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // create some ccaches (so that the one we keep around as 'ccache' is not default) if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); @@ -1282,14 +1281,14 @@ int check_cc_ccache_get_change_time(void) { if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAZ.ORG", &ccache); } - + // change it in all the ways it can change, checking after each - + // the ccache is created if (!err) { check_once_cc_ccache_get_change_time(ccache, &last_time, ccNoError, "new ccache (change time should be > 0)"); } - + // the ccache is made default if (!err) { err = cc_ccache_set_default(ccache); @@ -1297,7 +1296,7 @@ int check_cc_ccache_get_change_time(void) { if (!err) { check_once_cc_ccache_get_change_time(ccache, &last_time, ccNoError, "non-default ccache became default"); } - + // the ccache is made not-default if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "something@ELSE.COM", &dummy_ccache); @@ -1305,20 +1304,20 @@ int check_cc_ccache_get_change_time(void) { if (!err) { err = cc_ccache_set_default(dummy_ccache); } - if (dummy_ccache) { + if (dummy_ccache) { cc_ccache_release(dummy_ccache); } if (!err) { check_once_cc_ccache_get_change_time(ccache, &last_time, ccNoError, "default ccache became non-default"); } - + // try with bad params - + // NULL out param if (!err) { check_once_cc_ccache_get_change_time(ccache, NULL, ccErrBadParam, "NULL out param for time"); } - + // store a credential if (!err) { new_v5_creds_union(&creds_union, "BAR.ORG"); @@ -1326,7 +1325,7 @@ int check_cc_ccache_get_change_time(void) { release_v5_creds_union(&creds_union); } check_once_cc_ccache_get_change_time(ccache, &last_time, ccNoError, "stored new credential"); - + if (!err) { // change principal (fails with ccErrBadInternalMessage) err = cc_ccache_set_principal(ccache, cc_credentials_v5, "foo@BAR.ORG"); @@ -1337,7 +1336,7 @@ int check_cc_ccache_get_change_time(void) { } } check_once_cc_context_get_change_time(context, &last_time, ccNoError, "after changing a principle"); - + // remove a credential if (!err) { err = cc_ccache_new_credentials_iterator(ccache, &creds_iterator); @@ -1352,8 +1351,8 @@ int check_cc_ccache_get_change_time(void) { err = cc_ccache_remove_credentials(ccache, credentials); } check_once_cc_context_get_change_time(context, &last_time, ccNoError, "after removing a credential"); - - + + // invalid ccache if (!err) { err = destroy_all_ccaches(context); @@ -1361,15 +1360,15 @@ int check_cc_ccache_get_change_time(void) { if (!err) { check_once_cc_ccache_get_change_time(ccache, &last_time, ccErrInvalidCCache, "getting change time on destroyed ccache"); } - + if (ccache) { cc_ccache_release(ccache); } - if (context) { + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_get_change_time */ - + END_TEST_AND_RETURN } @@ -1379,39 +1378,39 @@ int check_cc_ccache_get_change_time(void) { cc_int32 check_once_cc_ccache_get_last_default_time(cc_ccache_t ccache, cc_time_t *last_time, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_time_t this_time = 0; - + cc_int32 possible_return_values[5] = { - ccNoError, - ccErrInvalidCCache, - ccErrBadParam, - ccErrNeverDefault, - ccErrCCacheNotFound, + ccNoError, + ccErrInvalidCCache, + ccErrBadParam, + ccErrNeverDefault, + ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_get_last_default_time - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (last_time == NULL) { err = cc_ccache_get_last_default_time(ccache, NULL); // passed NULL to compare against because intention is actually to pass bad param instead } else { err = cc_ccache_get_last_default_time(ccache, &this_time); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err && last_time) { check_if(this_time > *last_time, "last default time isn't as expected"); *last_time = this_time; } - + #endif /* cc_ccache_get_last_default_time */ - + END_CHECK_ONCE; - + return err; } @@ -1425,20 +1424,20 @@ int check_cc_ccache_get_last_default_time(void) { cc_time_t last_time_1 = 0; cc_time_t last_time_2 = 0; cc_string_t name = NULL; - + BEGIN_TEST("cc_ccache_get_last_default_time"); - + #ifndef cc_ccache_get_last_default_time log_error("cc_ccache_get_last_default_time is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // create 2 ccaches if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@ONE.ORG", &ccache_1); @@ -1446,18 +1445,18 @@ int check_cc_ccache_get_last_default_time(void) { if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@TWO.ORG", &ccache_2); } - + if (!err) { err = cc_ccache_get_change_time(ccache_1, &last_time_1); } - - // since we destroyed all ccaches before creating these two, + + // since we destroyed all ccaches before creating these two, // ccache_1 should be default and ccache_2 should never have been default if (!err) { check_once_cc_ccache_get_last_default_time(ccache_1, &last_time_1, ccNoError, "ccache_1 default at creation"); check_once_cc_ccache_get_last_default_time(ccache_2, &last_time_2, ccErrNeverDefault, "ccache_2 never default"); } - + // make ccache_2 default and check each of their times again if (!err) { err = cc_ccache_set_default(ccache_2); @@ -1474,10 +1473,10 @@ int check_cc_ccache_get_last_default_time(void) { if (!err) { check_once_cc_ccache_get_last_default_time(ccache_1, NULL, ccErrBadParam, "NULL out param"); } - + // non-existent ccache - if (ccache_2) { - cc_ccache_release(ccache_2); + if (ccache_2) { + cc_ccache_release(ccache_2); ccache_2 = NULL; } if (!err) { @@ -1490,20 +1489,20 @@ int check_cc_ccache_get_last_default_time(void) { cc_ccache_destroy(ccache_2); ccache_2 = NULL; } - + if (!err) { check_once_cc_ccache_get_last_default_time(ccache_1, &last_time_1, ccErrInvalidCCache, "destroyed ccache"); } - + if (ccache_1) { cc_ccache_release(ccache_1); } - - if (context) { + + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_get_last_default_time */ - + END_TEST_AND_RETURN } @@ -1514,23 +1513,23 @@ int check_cc_ccache_move(void) { cc_context_t context = NULL; cc_ccache_t source = NULL; cc_ccache_t destination = NULL; - + cc_credentials_union creds_union; unsigned int i = 0; - + BEGIN_TEST("cc_ccache_move"); - + #ifndef cc_ccache_move log_error("cc_ccache_move is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // create 2 ccaches if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@ONE.ORG", &source); @@ -1538,7 +1537,7 @@ int check_cc_ccache_move(void) { if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@TWO.ORG", &destination); } - + // store credentials in each for (i = 0; !err && (i < 10); i++) { new_v5_creds_union(&creds_union, "ONE.ORG"); @@ -1548,7 +1547,7 @@ int check_cc_ccache_move(void) { new_v5_creds_union(&creds_union, "TWO.ORG"); err = cc_ccache_store_credentials(destination, &creds_union); } - + // move source into destination if (!err) { check_once_cc_ccache_move(source, destination, ccNoError, "valid params"); @@ -1558,25 +1557,25 @@ int check_cc_ccache_move(void) { if (!err) { check_once_cc_ccache_move(destination, NULL, ccErrBadParam, "NULL destination param"); } - + // non-existent ccache if (!err) { check_once_cc_ccache_move(destination, source, ccErrInvalidCCache, "recently moved source as destination param"); } - + if (source) { cc_ccache_release(source); } if (destination) { cc_ccache_release(destination); } - - if (context) { + + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + #endif /* cc_ccache_move */ - + END_TEST_AND_RETURN - - + + } cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, cc_int32 expected_err, const char *description) { @@ -1585,25 +1584,25 @@ cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, cc_credentials_t creds = NULL; cc_credentials_iterator_t cred_iterator = NULL; unsigned int i = 0; - + cc_string_t src_principal = NULL; cc_string_t dst_principal = NULL; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrBadParam, - ccErrInvalidCCache, + ccNoError, + ccErrBadParam, + ccErrInvalidCCache, ccErrCCacheNotFound, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_move - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (destination) { - // verify all of destination's credentials are no longer there (save a list and call remove_cred for each, expecting an err in response) + // verify all of destination's credentials are no longer there (save a list and call remove_cred for each, expecting an err in response) if (!err) { err = cc_ccache_new_credentials_iterator(destination, &cred_iterator); } @@ -1616,8 +1615,8 @@ cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, if (err == ccIteratorEnd) { err = ccNoError; } - if (cred_iterator) { - cc_credentials_iterator_release(cred_iterator); + if (cred_iterator) { + cc_credentials_iterator_release(cred_iterator); cred_iterator = NULL; } @@ -1626,16 +1625,16 @@ cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, err = cc_ccache_get_principal(source, cc_credentials_v5, &src_principal); } } - - + + if (!err) { err = cc_ccache_move(source, destination); } - + // check returned error check_err(err, expected_err, possible_return_values); - - + + if (!err) { // verify all of destination's credentials are no longer there (save a list and call remove_cred for each, expecting an err in response) i = 0; @@ -1657,7 +1656,7 @@ cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, } // verify that handles for source are no longer valid (get_change_time) - if (src_principal) { + if (src_principal) { cc_string_release(src_principal); src_principal = NULL; } @@ -1665,16 +1664,16 @@ cc_int32 check_once_cc_ccache_move(cc_ccache_t source, cc_ccache_t destination, err = cc_ccache_get_principal(source, cc_credentials_v5, &src_principal); check_if(err != ccErrInvalidCCache, "source ccache was not invalidated after move"); } - - + + if (cred_iterator) { cc_credentials_iterator_release(cred_iterator); } if (src_principal) { cc_string_release(src_principal); } if (dst_principal) { cc_string_release(dst_principal); } - + #endif /* cc_ccache_move */ - + END_CHECK_ONCE; - + return err; } @@ -1687,14 +1686,14 @@ int check_cc_ccache_compare(void) { cc_ccache_t ccache_a = NULL; cc_ccache_t ccache_b = NULL; cc_uint32 equal = 0; - + BEGIN_TEST("cc_ccache_compare"); - + #ifndef cc_ccache_compare log_error("cc_ccache_compare is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); if (!err) { @@ -1711,7 +1710,7 @@ int check_cc_ccache_compare(void) { check_once_cc_ccache_compare(ccache_a, ccache_a, &equal, ccNoError, "compare ccache with same pointer"); equal = 1; check_once_cc_ccache_compare(ccache_a, ccache_b, &equal, ccNoError, "compare different handles to same ccache"); - + if (ccache_b) { cc_ccache_release(ccache_b); ccache_b = NULL; @@ -1726,40 +1725,40 @@ int check_cc_ccache_compare(void) { if (ccache_a) { cc_ccache_release(ccache_a); } if (ccache_b) { cc_ccache_release(ccache_b); } - - if (context) { + + if (context) { err = destroy_all_ccaches(context); - cc_context_release(context); + cc_context_release(context); } - + #endif /* cc_ccache_compare */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_compare(cc_ccache_t ccache, cc_ccache_t compare_to, cc_uint32 *equal, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_uint32 actually_equal = 0; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrInvalidContext, - ccErrBadParam, + ccNoError, + ccErrInvalidContext, + ccErrBadParam, ccErrServerUnavailable, }; BEGIN_CHECK_ONCE(description); #ifdef cc_ccache_compare - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (equal) { actually_equal = *equal; - } - + } + err = cc_ccache_compare(ccache, compare_to, equal); - + if (!err && equal) { if (actually_equal) { check_if(actually_equal != *equal, "equal ccaches not considered equal"); @@ -1768,12 +1767,12 @@ cc_int32 check_once_cc_ccache_compare(cc_ccache_t ccache, cc_ccache_t compare_to check_if(actually_equal != *equal, "non-equal ccaches considered equal"); } } - + // check returned error check_err(err, expected_err, possible_return_values); - + #endif /* cc_ccache_compare */ - + return err; } @@ -1785,14 +1784,14 @@ int check_cc_ccache_get_kdc_time_offset(void) { cc_context_t context = NULL; cc_ccache_t ccache = NULL; cc_time_t time_offset = 0; - + BEGIN_TEST("cc_ccache_get_kdc_time_offset"); - + #ifndef cc_ccache_get_kdc_time_offset log_error("cc_ccache_get_kdc_time_offset is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); if (!err) { @@ -1804,7 +1803,7 @@ int check_cc_ccache_get_kdc_time_offset(void) { time_offset = 0; check_once_cc_ccache_get_kdc_time_offset(ccache, cc_credentials_v5, &time_offset, ccErrTimeOffsetNotSet, "brand new ccache (offset not yet set)"); - + time_offset = 10; if (!err) { err = cc_ccache_set_kdc_time_offset(ccache, cc_credentials_v5, time_offset); @@ -1821,58 +1820,58 @@ int check_cc_ccache_get_kdc_time_offset(void) { if (!err) { check_once_cc_ccache_get_kdc_time_offset(ccache, cc_credentials_v4, &time_offset, ccNoError, "asking for v4 offset when v4 and v5 are set"); } - + check_once_cc_ccache_get_kdc_time_offset(ccache, cc_credentials_v5, NULL, ccErrBadParam, "NULL time_offset out param"); check_once_cc_ccache_get_kdc_time_offset(ccache, cc_credentials_v4_v5, &time_offset, ccErrBadCredentialsVersion, "v4_v5 creds_vers in param (invalid)"); if (ccache) { cc_ccache_release(ccache); } - - if (context) { + + if (context) { err = destroy_all_ccaches(context); - cc_context_release(context); + cc_context_release(context); } - + #endif /* cc_ccache_get_kdc_time_offset */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_get_kdc_time_offset(cc_ccache_t ccache, cc_int32 credentials_version, cc_time_t *time_offset, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_time_t expected_offset; - + cc_int32 possible_return_values[7] = { - ccNoError, - ccErrTimeOffsetNotSet, - ccErrCCacheNotFound, - ccErrInvalidCCache, - ccErrBadParam, - ccErrServerUnavailable, - ccErrBadCredentialsVersion, + ccNoError, + ccErrTimeOffsetNotSet, + ccErrCCacheNotFound, + ccErrInvalidCCache, + ccErrBadParam, + ccErrServerUnavailable, + ccErrBadCredentialsVersion, }; BEGIN_CHECK_ONCE(description); #ifdef cc_ccache_get_kdc_time_offset - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (time_offset) { expected_offset = *time_offset; } - + err = cc_ccache_get_kdc_time_offset(ccache, credentials_version, time_offset); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err && time_offset) { check_if(*time_offset != expected_offset, "kdc time offset doesn't match expected value"); } - + #endif /* cc_ccache_get_kdc_time_offset */ - + return err; } @@ -1883,14 +1882,14 @@ int check_cc_ccache_set_kdc_time_offset(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_set_kdc_time_offset"); - + #ifndef cc_ccache_set_kdc_time_offset log_error("cc_ccache_set_kdc_time_offset is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); if (!err) { @@ -1902,55 +1901,55 @@ int check_cc_ccache_set_kdc_time_offset(void) { check_once_cc_ccache_set_kdc_time_offset(ccache, cc_credentials_v5, 0, ccNoError, "first time setting offset (v5)"); check_once_cc_ccache_set_kdc_time_offset(ccache, cc_credentials_v4, 0, ccNoError, "first time setting offset (v4)"); - + check_once_cc_ccache_set_kdc_time_offset(ccache, cc_credentials_v4_v5, 0, ccErrBadCredentialsVersion, "invalid creds_vers (v4_v5)"); if (ccache) { cc_ccache_release(ccache); } - - if (context) { + + if (context) { err = destroy_all_ccaches(context); - cc_context_release(context); + cc_context_release(context); } - + #endif /* cc_ccache_set_kdc_time_offset */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_set_kdc_time_offset(cc_ccache_t ccache, cc_int32 credentials_version, cc_time_t time_offset, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_time_t stored_offset = 0; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrCCacheNotFound, - ccErrInvalidCCache, - ccErrBadParam, - ccErrServerUnavailable, + ccNoError, + ccErrCCacheNotFound, + ccErrInvalidCCache, + ccErrBadParam, + ccErrServerUnavailable, ccErrBadCredentialsVersion, }; BEGIN_CHECK_ONCE(description); #ifdef cc_ccache_set_kdc_time_offset - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_ccache_set_kdc_time_offset(ccache, credentials_version, time_offset); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { err = cc_ccache_get_kdc_time_offset(ccache, credentials_version, &stored_offset); } - + if (!err) { check_if(time_offset != stored_offset, "kdc time offset doesn't match expected value"); } - + #endif /* cc_ccache_set_kdc_time_offset */ - + return err; } @@ -1961,14 +1960,14 @@ int check_cc_ccache_clear_kdc_time_offset(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_ccache_clear_kdc_time_offset"); - + #ifndef cc_ccache_clear_kdc_time_offset log_error("cc_ccache_clear_kdc_time_offset is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); if (!err) { @@ -1983,55 +1982,53 @@ int check_cc_ccache_clear_kdc_time_offset(void) { err = cc_ccache_set_kdc_time_offset(ccache, cc_credentials_v5, 0); err = cc_ccache_set_kdc_time_offset(ccache, cc_credentials_v4, 0); - + check_once_cc_ccache_clear_kdc_time_offset(ccache, cc_credentials_v5, ccNoError, "clearing v5"); check_once_cc_ccache_clear_kdc_time_offset(ccache, cc_credentials_v4, ccNoError, "clearing v4"); - + check_once_cc_ccache_clear_kdc_time_offset(ccache, cc_credentials_v4_v5, ccErrBadCredentialsVersion, "bad in param creds vers (v4_v5)"); - + if (ccache) { cc_ccache_release(ccache); } - - if (context) { + + if (context) { err = destroy_all_ccaches(context); - cc_context_release(context); + cc_context_release(context); } - + #endif /* cc_ccache_clear_kdc_time_offset */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_ccache_clear_kdc_time_offset(cc_ccache_t ccache, cc_int32 credentials_version, cc_int32 expected_err, const char *description) { cc_int32 err = ccNoError; cc_time_t stored_offset = 0; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrCCacheNotFound, - ccErrInvalidCCache, - ccErrBadParam, - ccErrServerUnavailable, + ccNoError, + ccErrCCacheNotFound, + ccErrInvalidCCache, + ccErrBadParam, + ccErrServerUnavailable, ccErrBadCredentialsVersion, }; BEGIN_CHECK_ONCE(description); #ifdef cc_ccache_clear_kdc_time_offset - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) err = cc_ccache_clear_kdc_time_offset(ccache, credentials_version); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { err = cc_ccache_get_kdc_time_offset(ccache, credentials_version, &stored_offset); check_if(err != ccErrTimeOffsetNotSet, "time offset not cleared"); } - + #endif /* cc_ccache_clear_kdc_time_offset */ - + return err; } - - diff --git a/src/ccapi/test/test_ccapi_check.c b/src/ccapi/test/test_ccapi_check.c index 8352adfdc..7f55b4557 100644 --- a/src/ccapi/test/test_ccapi_check.c +++ b/src/ccapi/test/test_ccapi_check.c @@ -14,20 +14,20 @@ int _check_if(int expression, const char *file, int line, const char *expression _log_error_v(file, line, format, ap); va_end(ap); } - + if (current_test_activity) { fprintf(stdout, " (%s)", current_test_activity); } } - - return (expression != 0); + + return (expression != 0); } int array_contains_int(cc_int32 *array, int size, cc_int32 value) { if (array != NULL && size > 0) { int i = 0; - while (i < size && array[i] != value) { - i++; + while (i < size && array[i] != value) { + i++; } if (i < size) { return 1; diff --git a/src/ccapi/test/test_ccapi_check.h b/src/ccapi/test/test_ccapi_check.h index c05a5152e..0a953481a 100644 --- a/src/ccapi/test/test_ccapi_check.h +++ b/src/ccapi/test/test_ccapi_check.h @@ -7,21 +7,21 @@ #include "test_ccapi_globals.h" int _check_if(int expression, const char *file, int line, const char *expression_string, const char *format, ...); - + #define check_int(a, b) \ check_if(a != b, NULL) /* * if expression evaluates to true, check_if increments the failure_count and prints: - * + * * check_if(a!=a, NULL); - * ==> "/path/to/file:line: a!=a" - * + * ==> "/path/to/file:line: a!=a" + * * check_if(a!=a, "This shouldn't be happening"); * ==> "/path/to/file:line: This shouldn't be happening" - * + * * check_if(a!=a, "This has happened %d times now", 3); - * ==> "/path/to/file:line: This has happened 3 times now" + * ==> "/path/to/file:line: This has happened 3 times now" */ #define check_if(expression, format, ...) \ diff --git a/src/ccapi/test/test_ccapi_constants.c b/src/ccapi/test/test_ccapi_constants.c index 10d07f061..9f2aecbc2 100644 --- a/src/ccapi/test/test_ccapi_constants.c +++ b/src/ccapi/test/test_ccapi_constants.c @@ -5,16 +5,16 @@ int check_constants(void) { BEGIN_TEST("constants"); /* API versions */ - + check_int(ccapi_version_2, 2); check_int(ccapi_version_3, 3); check_int(ccapi_version_4, 4); check_int(ccapi_version_5, 5); check_int(ccapi_version_6, 6); - + /* Errors */ - - check_int(ccNoError , 0 ); // 0 + + check_int(ccNoError , 0 ); // 0 check_int(ccIteratorEnd , 201); // 201 check_int(ccErrBadParam , 202); // 202 check_int(ccErrNoMem , 203); // 203 @@ -45,7 +45,7 @@ int check_constants(void) { check_int(ccErrNotImplemented , 228); // 228 /* Credentials versions */ - + check_int(cc_credentials_v4, 1); check_int(cc_credentials_v5, 2); check_int(cc_credentials_v4_v5, (cc_credentials_v4 | cc_credentials_v5)); @@ -58,9 +58,9 @@ int check_constants(void) { check_int(cc_lock_downgrade, 3); /* Locking Modes */ - + check_int(cc_lock_noblock, 0); check_int(cc_lock_block, 1); - + END_TEST_AND_RETURN } diff --git a/src/ccapi/test/test_ccapi_context.c b/src/ccapi/test/test_ccapi_context.c index 51714539e..09feebee5 100644 --- a/src/ccapi/test/test_ccapi_context.c +++ b/src/ccapi/test/test_ccapi_context.c @@ -7,110 +7,110 @@ int check_cc_initialize(void) { cc_int32 err = 0; cc_context_t context = NULL; - + BEGIN_TEST("cc_initialize"); - + // try every api_version err = check_once_cc_initialize(&context, ccapi_version_2, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_2"); // err == CC_BAD_API_VERSION (9) would be imported by CredentialsCache2.h - err = check_once_cc_initialize(&context, ccapi_version_3, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_3"); // !err - err = check_once_cc_initialize(&context, ccapi_version_4, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_4"); // " - err = check_once_cc_initialize(&context, ccapi_version_5, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_5"); // " - err = check_once_cc_initialize(&context, ccapi_version_6, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_6"); // " - + err = check_once_cc_initialize(&context, ccapi_version_3, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_3"); // !err + err = check_once_cc_initialize(&context, ccapi_version_4, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_4"); // " + err = check_once_cc_initialize(&context, ccapi_version_5, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_5"); // " + err = check_once_cc_initialize(&context, ccapi_version_6, NULL, NULL, ccNoError, "cc_initialize with ccapi_version_6"); // " + // try bad api_version - err = check_once_cc_initialize(&context, INT_MAX, NULL, NULL, ccErrBadAPIVersion, NULL); // err == ccErrBadAPIVersion - + err = check_once_cc_initialize(&context, INT_MAX, NULL, NULL, ccErrBadAPIVersion, NULL); // err == ccErrBadAPIVersion + // try bad param - err = check_once_cc_initialize(NULL, ccapi_version_3, NULL, NULL, ccErrBadParam, NULL); // err == ccErrBadParam - + err = check_once_cc_initialize(NULL, ccapi_version_3, NULL, NULL, ccErrBadParam, NULL); // err == ccErrBadParam + END_TEST_AND_RETURN } cc_int32 check_once_cc_initialize(cc_context_t *out_context, cc_int32 in_version, cc_int32 *out_supported_version, char const **out_vendor, cc_int32 expected_err, const char *description) { cc_int32 err = 0; cc_context_t context; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrNoMem, - ccErrBadAPIVersion, + ccNoError, + ccErrNoMem, + ccErrBadAPIVersion, ccErrBadParam, }; BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_initialize(out_context, in_version, out_supported_version, out_vendor); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (out_context) { context = *out_context; } else { context = NULL; } - + // check output parameters if (!err) { check_if(context == NULL, NULL); - if (context) { - cc_context_release(context); + if (context) { + cc_context_release(context); *out_context = NULL; } } else { check_if(context != NULL, NULL); } - + return err; } int check_cc_context_release(void) { cc_int32 err = 0; cc_context_t context = NULL; - + BEGIN_TEST("cc_context_release"); - + #ifndef cc_context_release log_error("cc_context_release is not implemented yet"); failure_count++; #else - + // try with valid context err = check_once_cc_context_release(&context, ccNoError, NULL); - + // try with NULL //err = check_once_cc_context_release(NULL, ccErrInvalidContext); - /* calling with NULL context crashes, because this macro expands to + /* calling with NULL context crashes, because this macro expands to ((NULL) -> functions -> release (NULL)) which is dereferencing NULL which is bad. */ - + if (context) { cc_context_release(context); } - + #endif /* cc_context_release */ - + END_TEST_AND_RETURN } cc_int32 check_once_cc_context_release(cc_context_t *out_context, cc_int32 expected_err, const char *description) { cc_int32 err = 0; cc_context_t context = NULL; - + cc_int32 possible_return_values[2] = { - ccNoError, - ccErrInvalidContext, + ccNoError, + ccErrInvalidContext, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_release - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (out_context) { err = cc_initialize(out_context, ccapi_version_3, NULL, NULL); - if (!err) { - context = *out_context; + if (!err) { + context = *out_context; } } - + if (err != ccNoError) { log_error("failure in cc_initialize, unable to perform check"); return err; @@ -120,13 +120,13 @@ cc_int32 check_once_cc_context_release(cc_context_t *out_context, cc_int32 expec // check returned error check_err(err, expected_err, possible_return_values); } - + *out_context = NULL; - + #endif /* cc_context_release */ - + END_CHECK_ONCE; - + return err; } @@ -138,32 +138,32 @@ int check_cc_context_get_change_time(void) { cc_credentials_union creds_union; cc_credentials_iterator_t creds_iterator = NULL; cc_credentials_t credentials = NULL; - + BEGIN_TEST("cc_context_get_change_time"); - + #ifndef cc_context_get_change_time log_error("cc_context_get_change_time is not implemented yet"); failure_count++; #else - + /* * Make a context * make sure the change time changes after: - * a ccache is created - * a ccache is destroyed - * a credential is stored - * a credential is removed - * a ccache principal is changed + * a ccache is created + * a ccache is destroyed + * a credential is stored + * a credential is removed + * a ccache principal is changed * the default ccache is changed * clean up memory */ - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); if (!err) { - + // try bad parameters first err = check_once_cc_context_get_change_time(context, NULL, ccErrBadParam, "NULL param, should fail"); - + // make sure we have a default ccache err = cc_context_open_default_ccache(context, &ccache); if (err == ccErrCCacheNotFound) { @@ -175,11 +175,11 @@ int check_cc_context_get_change_time(void) { // either the default ccache already existed or we just created it // either way, the get_change_time should now give something > 0 check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "first-run, should be > 0"); - + // create a ccache err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after creating a new ccache"); - + // store a credential if (!err) { new_v5_creds_union(&creds_union, "BAR.ORG"); @@ -187,7 +187,7 @@ int check_cc_context_get_change_time(void) { release_v5_creds_union(&creds_union); } check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after storing a credential"); - + if (!err) { // change principal (fails with ccErrBadInternalMessage) err = cc_ccache_set_principal(ccache, cc_credentials_v5, "foo@BAR.ORG"); @@ -198,7 +198,7 @@ int check_cc_context_get_change_time(void) { } } check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after changing a principle"); - + // remove a credential if (!err) { err = cc_ccache_new_credentials_iterator(ccache, &creds_iterator); @@ -212,25 +212,25 @@ int check_cc_context_get_change_time(void) { if (!err) { err = cc_ccache_remove_credentials(ccache, credentials); } - check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after removing a credential"); - + check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after removing a credential"); + if (!err) { // change default ccache err = cc_ccache_set_default(ccache); check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after changing default ccache"); } - + if (ccache) { // destroy a ccache err = cc_ccache_destroy(ccache); check_once_cc_context_get_change_time(context, &last_change_time, ccNoError, "after destroying a ccache"); } } - + if (context) { cc_context_release(context); } - + #endif /* cc_get_change_time */ - + END_TEST_AND_RETURN } @@ -238,37 +238,37 @@ cc_int32 check_once_cc_context_get_change_time(cc_context_t context, cc_time_t * cc_int32 err = 0; cc_time_t last_change_time; cc_time_t current_change_time = 0; - + cc_int32 possible_return_values[3] = { - ccNoError, - ccErrInvalidContext, + ccNoError, + ccErrInvalidContext, ccErrBadParam, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_get_change_time - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (time != NULL) { // if we were passed NULL, then we're looking to pass a bad param err = cc_context_get_change_time(context, ¤t_change_time); } else { err = cc_context_get_change_time(context, NULL); } - + check_err(err, expected_err, possible_return_values); - + if (!err) { last_change_time = *time; check_if(current_change_time <= last_change_time, "context change time did not increase when it was supposed to (%d <= %d)", current_change_time, last_change_time); *time = current_change_time; } - + #endif /* cc_context_get_change_time */ - + END_CHECK_ONCE; - + return err; } @@ -277,19 +277,19 @@ int check_cc_context_get_default_ccache_name(void) { cc_context_t context = NULL; cc_ccache_t ccache = NULL; cc_string_t name = NULL; - + BEGIN_TEST("cc_context_get_default_ccache_name"); - + #ifndef cc_context_get_default_ccache_name log_error("cc_context_get_default_ccache_name is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { // try bad parameters first err = check_once_cc_context_get_default_ccache_name(context, NULL, ccErrBadParam, NULL); - + // try with no default err = destroy_all_ccaches(context); err = cc_context_open_default_ccache(context, &ccache); @@ -297,54 +297,54 @@ int check_cc_context_get_default_ccache_name(void) { log_error("didn't remove all ccaches"); } err = check_once_cc_context_get_default_ccache_name(context, &name, ccNoError, NULL); - + // try normally err = cc_context_create_default_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); if (ccache) { cc_ccache_release(ccache); } err = check_once_cc_context_get_default_ccache_name(context, &name, ccNoError, NULL); - + } - + if (context) { cc_context_release(context); } - + #endif /* cc_context_get_default_ccache_name */ - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } cc_int32 check_once_cc_context_get_default_ccache_name(cc_context_t context, cc_string_t *name, cc_int32 expected_err, const char *description) { cc_int32 err = 0; - + cc_int32 possible_return_values[4] = { - ccNoError, - ccErrInvalidContext, - ccErrBadParam, - ccErrNoMem, + ccNoError, + ccErrInvalidContext, + ccErrBadParam, + ccErrNoMem, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_get_default_ccache_name - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (name != NULL) { // if we were passed NULL, then we're looking to pass a bad param err = cc_context_get_default_ccache_name(context, name); } else { err = cc_context_get_default_ccache_name(context, NULL); } - + // check returned error check_err(err, expected_err, possible_return_values); - + // not really anything else to check - + if (name && *name) { cc_string_release(*name); } - + #endif /* cc_context_get_default_ccache_name */ - + END_CHECK_ONCE; - + return err; } @@ -353,16 +353,16 @@ int check_cc_context_open_ccache(void) { cc_context_t context = NULL; cc_ccache_t ccache = NULL; cc_string_t name = NULL; - + BEGIN_TEST("cc_context_open_ccache"); - + #ifndef cc_context_open_ccache log_error("cc_context_open_ccache is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { // make sure we have a default ccache err = cc_context_open_default_ccache(context, &ccache); if (err == ccErrCCacheNotFound) { @@ -372,7 +372,7 @@ int check_cc_context_open_ccache(void) { err = cc_ccache_release(ccache); ccache = NULL; } - + // try default ccache err = cc_context_get_default_ccache_name(context, &name); if (!err) { @@ -382,7 +382,7 @@ int check_cc_context_open_ccache(void) { // try bad parameters err = check_once_cc_context_open_ccache(context, NULL, &ccache, ccErrBadParam, NULL); err = check_once_cc_context_open_ccache(context, name->data, NULL, ccErrBadParam, NULL); - + // try a ccache that doesn't exist (create one and then destroy it) err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); if (!err) { @@ -392,67 +392,67 @@ int check_cc_context_open_ccache(void) { err = cc_ccache_destroy(ccache); ccache = NULL; } - + err = check_once_cc_context_open_ccache(context, name->data, &ccache, ccErrCCacheNotFound, NULL); } - + if (context) { cc_context_release(context); } - + #endif /* cc_context_open_ccache */ - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } cc_int32 check_once_cc_context_open_ccache(cc_context_t context, const char *name, cc_ccache_t *ccache, cc_int32 expected_err, const char *description) { cc_int32 err = 0; cc_string_t stored_name = NULL; - + cc_int32 possible_return_values[6] = { - ccNoError, - ccErrBadName, - ccErrInvalidContext, - ccErrNoMem, - ccErrCCacheNotFound, - ccErrBadParam, + ccNoError, + ccErrBadName, + ccErrInvalidContext, + ccErrNoMem, + ccErrCCacheNotFound, + ccErrBadParam, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_open_ccache - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (ccache != NULL) { // if we were passed NULL, then we're looking to pass a bad param err = cc_context_open_ccache(context, name, ccache); } else { err = cc_context_open_ccache(context, name, NULL); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(*ccache == NULL, NULL); - + if (!err) { err = cc_ccache_get_name(*ccache, &stored_name); } - if (!err) { - check_if(strcmp(stored_name->data, name), NULL); + if (!err) { + check_if(strcmp(stored_name->data, name), NULL); } if (stored_name) { cc_string_release(stored_name); } - - + + if (ccache && *ccache) { cc_ccache_release(*ccache); *ccache = NULL; } } - + #endif /* cc_context_open_ccache */ - + END_CHECK_ONCE; - + return err; } @@ -460,38 +460,38 @@ int check_cc_context_open_default_ccache(void) { cc_int32 err = 0; cc_context_t context = NULL; cc_ccache_t ccache = NULL; - + BEGIN_TEST("cc_context_open_default_ccache"); - + #ifndef cc_context_open_default_ccache log_error("cc_context_open_default_ccache is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { // make sure we have a default ccache err = cc_context_create_default_ccache(context, cc_credentials_v5, "foo/bar@BAZ.ORG", &ccache); if (ccache) { cc_ccache_release(ccache); } - + // try default ccache if (!err) { err = check_once_cc_context_open_default_ccache(context, &ccache, ccNoError, NULL); } - + // try bad parameters err = check_once_cc_context_open_default_ccache(context, NULL, ccErrBadParam, NULL); - + // try with no default ccache (destroy all ccaches first) err = destroy_all_ccaches(context); - + err = check_once_cc_context_open_default_ccache(context, &ccache, ccErrCCacheNotFound, NULL); } - + if (context) { cc_context_release(context); } - + #endif /* cc_context_open_default_ccache */ - + END_TEST_AND_RETURN } @@ -499,33 +499,33 @@ cc_int32 check_once_cc_context_open_default_ccache(cc_context_t context, cc_ccac cc_int32 err = 0; cc_string_t given_name = NULL; cc_string_t default_name = NULL; - + cc_int32 possible_return_values[5] = { - ccNoError, - ccErrInvalidContext, - ccErrNoMem, - ccErrCCacheNotFound, - ccErrBadParam, + ccNoError, + ccErrInvalidContext, + ccErrNoMem, + ccErrCCacheNotFound, + ccErrBadParam, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_open_default_ccache - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (ccache != NULL) { // if we were passed NULL, then we're looking to pass a bad param err = cc_context_open_default_ccache(context, ccache); } else { err = cc_context_open_default_ccache(context, NULL); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(*ccache == NULL, NULL); - + // make sure this ccache is the one we were looking to get back (compare name with cc_context_get_default_ccache_name) err = cc_ccache_get_name(*ccache, &given_name); err = cc_context_get_default_ccache_name(context, &default_name); @@ -534,17 +534,17 @@ cc_int32 check_once_cc_context_open_default_ccache(cc_context_t context, cc_ccac } if (given_name) { cc_string_release(given_name); } if (default_name) { cc_string_release(default_name); } - + if (ccache && *ccache) { cc_ccache_release(*ccache); *ccache = NULL; } } - + #endif /* cc_context_open_default_ccache */ - + END_CHECK_ONCE; - + return err; } @@ -553,16 +553,16 @@ int check_cc_context_create_ccache(void) { cc_context_t context = NULL; cc_ccache_t ccache = NULL; cc_string_t name = NULL; - + BEGIN_TEST("cc_context_create_ccache"); - + #ifndef cc_context_create_ccache log_error("cc_context_create_ccache is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { // try making a ccache with a non-unique name (the existing default's name) if (!err) { err = cc_context_create_default_ccache(context, cc_credentials_v5, "foo/bar@BAZ.ORG", &ccache); @@ -574,26 +574,26 @@ int check_cc_context_create_ccache(void) { if (!err) { err = check_once_cc_context_create_ccache(context, name->data, cc_credentials_v5, "foo@BAR.ORG", &ccache, ccNoError, NULL); } - + // try making a ccache with a unique name (the now destroyed default's name) if (ccache) { cc_ccache_destroy(ccache); } if (!err) { err = check_once_cc_context_create_ccache(context, name->data, cc_credentials_v5, "foo/baz@BAR.ORG", &ccache, ccNoError, NULL); } - + // try bad parameters err = check_once_cc_context_create_ccache(context, NULL, cc_credentials_v5, "foo@BAR.ORG", &ccache, ccErrBadParam, "NULL name"); // NULL name err = check_once_cc_context_create_ccache(context, "name", cc_credentials_v4_v5, "foo@BAR.ORG", &ccache, ccErrBadCredentialsVersion, "invalid creds_vers"); // invalid creds_vers err = check_once_cc_context_create_ccache(context, "name", cc_credentials_v5, NULL, &ccache, ccErrBadParam, "NULL principal"); // NULL principal err = check_once_cc_context_create_ccache(context, "name", cc_credentials_v5, "foo@BAR.ORG", NULL, ccErrBadParam, "NULL ccache"); // NULL ccache } - + if (name) { cc_string_release(name); } if (ccache) { cc_ccache_destroy(ccache); } if (context) { cc_context_release(context); } - + #endif /* cc_context_create_ccache */ - + END_TEST_AND_RETURN } @@ -604,27 +604,27 @@ cc_int32 check_once_cc_context_create_ccache(cc_context_t context, const char *n cc_uint32 stored_creds_vers = 0; cc_int32 possible_return_values[6] = { - ccNoError, - ccErrBadName, - ccErrBadParam, - ccErrInvalidContext, - ccErrNoMem, - ccErrBadCredentialsVersion, + ccNoError, + ccErrBadName, + ccErrBadParam, + ccErrInvalidContext, + ccErrNoMem, + ccErrBadCredentialsVersion, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_create_ccache - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_context_create_ccache(context, name, cred_vers, principal, ccache); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(*ccache == NULL, NULL); - + // make sure all of the ccache's info matches what we gave it // name err = cc_ccache_get_name(*ccache, &stored_name); @@ -639,17 +639,17 @@ cc_int32 check_once_cc_context_create_ccache(cc_context_t context, const char *n err = cc_ccache_get_principal(*ccache, cc_credentials_v5, &stored_principal); if (!err) { check_if(strcmp(stored_principal->data, principal), NULL); } if (stored_principal) { cc_string_release(stored_principal); } - + if (ccache && *ccache) { cc_ccache_destroy(*ccache); *ccache = NULL; } } - + #endif /* cc_context_create_ccache */ - + END_CHECK_ONCE; - + return err; } @@ -658,41 +658,41 @@ int check_cc_context_create_default_ccache(void) { cc_context_t context = NULL; cc_ccache_t ccache = NULL; cc_string_t name = NULL; - + BEGIN_TEST("cc_context_create_default_ccache"); - + #ifndef cc_context_create_default_ccache log_error("cc_context_create_default_ccache is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { // try making the default when there are no existing ccaches err = destroy_all_ccaches(context); if (!err) { err = check_once_cc_context_create_default_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache, ccNoError, NULL); } if (ccache) { cc_ccache_release(ccache); } - + // try making a new default when one already exists if (!err) { err = check_once_cc_context_create_default_ccache(context, cc_credentials_v5, "foo/baz@BAR.ORG", &ccache, ccNoError, NULL); } - + // try bad parameters err = check_once_cc_context_create_default_ccache(context, cc_credentials_v4_v5, "foo@BAR.ORG", &ccache, ccErrBadCredentialsVersion, "invalid creds_vers"); // invalid creds_vers err = check_once_cc_context_create_default_ccache(context, cc_credentials_v5, NULL, &ccache, ccErrBadParam, "NULL principal"); // NULL principal err = check_once_cc_context_create_default_ccache(context, cc_credentials_v5, "foo@BAR.ORG", NULL, ccErrBadParam, "NULL ccache"); // NULL ccache } - + if (name) { cc_string_release(name); } if (ccache) { cc_ccache_destroy(ccache); } if (context) { cc_context_release(context); } - + #endif /* cc_context_create_default_ccache */ - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } cc_int32 check_once_cc_context_create_default_ccache(cc_context_t context, cc_uint32 cred_vers, const char *principal, cc_ccache_t *ccache, cc_int32 expected_err, const char *description) { @@ -701,25 +701,25 @@ cc_int32 check_once_cc_context_create_default_ccache(cc_context_t context, cc_ui cc_uint32 stored_creds_vers = 0; cc_int32 possible_return_values[6] = { - ccNoError, + ccNoError, ccErrBadName, // how can this be possible when the name isn't a parameter? - ccErrBadParam, - ccErrInvalidContext, - ccErrNoMem, - ccErrBadCredentialsVersion, + ccErrBadParam, + ccErrInvalidContext, + ccErrNoMem, + ccErrBadCredentialsVersion, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_create_default_ccache - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_context_create_default_ccache(context, cred_vers, principal, ccache); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { if (ccache) { check_if(*ccache == NULL, NULL); } // make sure all of the ccache's info matches what we gave it @@ -730,17 +730,17 @@ cc_int32 check_once_cc_context_create_default_ccache(cc_context_t context, cc_ui err = cc_ccache_get_principal(*ccache, cc_credentials_v5, &stored_principal); if (!err) { check_if(strcmp(stored_principal->data, principal), NULL); } if (stored_principal) { cc_string_release(stored_principal); } - + if (ccache && *ccache) { cc_ccache_release(*ccache); *ccache = NULL; } } - + #endif /* cc_context_create_default_ccache */ - + END_CHECK_ONCE; - + return err; } @@ -749,41 +749,41 @@ int check_cc_context_create_new_ccache(void) { cc_context_t context = NULL; cc_ccache_t ccache = NULL; cc_string_t name = NULL; - + BEGIN_TEST("cc_context_create_new_ccache"); - + #ifndef cc_context_create_new_ccache log_error("cc_context_create_new_ccache is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { // try making when there are no existing ccaches (should have name of default) err = destroy_all_ccaches(context); if (!err) { err = check_once_cc_context_create_new_ccache(context, 1, cc_credentials_v5, "foo@BAR.ORG", &ccache, ccNoError, NULL); } if (ccache) { cc_ccache_release(ccache); } - + // try making a new ccache when one already exists (should not have name of default) if (!err) { err = check_once_cc_context_create_new_ccache(context, 0, cc_credentials_v5, "foo/baz@BAR.ORG", &ccache, ccNoError, NULL); } if (ccache) { cc_ccache_release(ccache); } - + // try bad parameters err = check_once_cc_context_create_new_ccache(context, 1, cc_credentials_v4_v5, "foo@BAR.ORG", &ccache, ccErrBadCredentialsVersion, "invalid creds_vers"); // invalid creds_vers err = check_once_cc_context_create_new_ccache(context, 1, cc_credentials_v5, NULL, &ccache, ccErrBadParam, "NULL principal"); // NULL principal err = check_once_cc_context_create_new_ccache(context, 1, cc_credentials_v5, "foo@BAR.ORG", NULL, ccErrBadParam, "NULL ccache"); // NULL ccache } - + if (name) { cc_string_release(name); } if (ccache) { cc_ccache_destroy(ccache); } if (context) { cc_context_release(context); } - + #endif /* cc_context_create_new_ccache */ - + END_TEST_AND_RETURN } @@ -793,27 +793,27 @@ cc_int32 check_once_cc_context_create_new_ccache(cc_context_t context, cc_int32 cc_string_t stored_name = NULL; cc_string_t stored_principal = NULL; cc_uint32 stored_creds_vers = 0; - + cc_int32 possible_return_values[6] = { - ccNoError, + ccNoError, ccErrBadName, // how can this be possible when the name isn't a parameter? - ccErrBadParam, - ccErrInvalidContext, - ccErrNoMem, - ccErrBadCredentialsVersion, + ccErrBadParam, + ccErrInvalidContext, + ccErrNoMem, + ccErrBadCredentialsVersion, }; BEGIN_CHECK_ONCE(description); - + #ifdef cc_context_create_new_ccache - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_context_create_new_ccache(context, cred_vers, principal, ccache); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { if (ccache) { check_if(*ccache == NULL, NULL); } // make sure all of the ccache's info matches what we gave it @@ -823,17 +823,17 @@ cc_int32 check_once_cc_context_create_new_ccache(cc_context_t context, cc_int32 if (!err) { err = cc_ccache_get_name(*ccache, &stored_name); } - if (!err) { + if (!err) { if (should_be_default) { - check_if(strcmp(stored_name->data, name->data), "new ccache does not have name of default"); + check_if(strcmp(stored_name->data, name->data), "new ccache does not have name of default"); } else { - check_if((strcmp(stored_name->data, name->data) == 0), "new cache has name of default"); - } + check_if((strcmp(stored_name->data, name->data) == 0), "new cache has name of default"); + } } if (name) { cc_string_release(name); } if (stored_name) { cc_string_release(stored_name); } - + // cred_vers err = cc_ccache_get_credentials_version(*ccache, &stored_creds_vers); if (!err) { check_if(stored_creds_vers != cred_vers, NULL); } @@ -841,17 +841,17 @@ cc_int32 check_once_cc_context_create_new_ccache(cc_context_t context, cc_int32 err = cc_ccache_get_principal(*ccache, cc_credentials_v5, &stored_principal); if (!err) { check_if(strcmp(stored_principal->data, principal), NULL); } if (stored_principal) { cc_string_release(stored_principal); } - + if (ccache && *ccache) { cc_ccache_release(*ccache); *ccache = NULL; } } - + #endif /* cc_context_create_new_ccache */ - + END_CHECK_ONCE; - + return err; } @@ -861,39 +861,39 @@ int check_cc_context_new_ccache_iterator(void) { cc_ccache_t ccache = NULL; cc_string_t name = NULL; cc_ccache_iterator_t iterator = NULL; - + BEGIN_TEST("cc_context_new_ccache_iterator"); - + #ifndef cc_context_new_ccache_iterator log_error("cc_context_new_ccache_iterator is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - if (!err) { + if (!err) { err = destroy_all_ccaches(context); } - if (!err) { + if (!err) { // try making when there are no existing ccaches (shouldn't make a difference, but just in case) check_once_cc_context_new_ccache_iterator(context, &iterator, ccNoError, "when there are no existing ccaches"); - + err = cc_context_create_default_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } - if (!err) { + if (!err) { // try making when at least one ccache already exists (just to cover all our bases) check_once_cc_context_new_ccache_iterator(context, &iterator, ccNoError, "when at least one ccache already exists"); - + // try bad parameters check_once_cc_context_new_ccache_iterator(context, NULL, ccErrBadParam, "NULL param"); // NULL iterator } // we'll do a comprehensive test of cc_ccache_iterator related functions later in the test suite - + if (name) { cc_string_release(name); } if (ccache) { cc_ccache_destroy(ccache); } if (context) { cc_context_release(context); } - + #endif /* cc_context_new_ccache_iterator */ - + END_TEST_AND_RETURN } @@ -901,27 +901,27 @@ cc_int32 check_once_cc_context_new_ccache_iterator(cc_context_t context, cc_ccac cc_int32 err = ccNoError; cc_int32 possible_return_values[4] = { - ccNoError, - ccErrBadParam, - ccErrNoMem, - ccErrInvalidContext, + ccNoError, + ccErrBadParam, + ccErrNoMem, + ccErrInvalidContext, }; BEGIN_CHECK_ONCE(description); #ifdef cc_context_create_new_ccache - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_context_new_ccache_iterator(context, iterator); - + // check returned error check_err(err, expected_err, possible_return_values); - + // we'll do a comprehensive test of cc_ccache_iterator related functions later - + #endif /* cc_context_create_new_ccache */ - + return err; } @@ -933,14 +933,14 @@ int check_cc_context_compare(void) { cc_context_t context_a = NULL; cc_context_t context_b = NULL; cc_uint32 equal = 0; - + BEGIN_TEST("cc_context_compare"); - + #ifndef cc_context_compare log_error("cc_context_compare is not implemented yet"); failure_count++; #else - + err = cc_initialize(&context_a, ccapi_version_3, NULL, NULL); if (!err) { err = cc_initialize(&context_b, ccapi_version_3, NULL, NULL); @@ -953,9 +953,9 @@ int check_cc_context_compare(void) { if (context_a) { cc_context_release(context_a); } if (context_b) { cc_context_release(context_b); } - + #endif /* cc_context_compare */ - + END_TEST_AND_RETURN } @@ -963,28 +963,28 @@ cc_int32 check_once_cc_context_compare(cc_context_t context, cc_context_t compar cc_int32 err = ccNoError; cc_int32 possible_return_values[4] = { - ccNoError, - ccErrInvalidContext, - ccErrBadParam, + ccNoError, + ccErrInvalidContext, + ccErrBadParam, ccErrServerUnavailable, }; BEGIN_CHECK_ONCE(description); #ifdef cc_context_compare - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_context_compare(context, compare_to, equal); - + if (!err) { *equal = 0; } - + // check returned error check_err(err, expected_err, possible_return_values); - + #endif /* cc_context_compare */ - + return err; } diff --git a/src/ccapi/test/test_ccapi_globals.c b/src/ccapi/test/test_ccapi_globals.c index f9aadbdda..a4ea63158 100644 --- a/src/ccapi/test/test_ccapi_globals.c +++ b/src/ccapi/test/test_ccapi_globals.c @@ -8,7 +8,7 @@ const char *current_test_name; const char *current_test_activity; const char * ccapi_error_strings[30] = { - + "ccNoError", /* 0 */ "ccIteratorEnd", /* 201 */ "ccErrBadParam", @@ -39,15 +39,15 @@ const char * ccapi_error_strings[30] = { "ccErrServerUnavailable", "ccErrServerInsecure", "ccErrServerCantBecomeUID", - + "ccErrTimeOffsetNotSet", /* 226 */ "ccErrBadInternalMessage", "ccErrNotImplemented", - + }; const char * ccapiv2_error_strings[24] = { - + "CC_NOERROR", "CC_BADNAME", "CC_NOTFOUND", @@ -65,23 +65,23 @@ const char * ccapiv2_error_strings[24] = { "CC_ERR_CACHE_RELEASE", "CC_ERR_CACHE_FULL", "CC_ERR_CRED_VERSION" - + }; const char *translate_ccapi_error(cc_int32 err) { - + if (err == 0) { return ccapi_error_strings[0]; - } else + } else if (err >= 0 && err <= 16){ return ccapiv2_error_strings[err]; - } else + } else if (err >= 201 && err <= 228){ return ccapi_error_strings[err - 200]; } else { return "\"Invalid or private CCAPI error\""; } - + return ""; } diff --git a/src/ccapi/test/test_ccapi_iterators.c b/src/ccapi/test/test_ccapi_iterators.c index c3254fbb2..e51c7cf32 100644 --- a/src/ccapi/test/test_ccapi_iterators.c +++ b/src/ccapi/test/test_ccapi_iterators.c @@ -13,13 +13,13 @@ int check_cc_ccache_iterator_next(void) { unsigned int i; BEGIN_TEST("cc_ccache_iterator_next"); - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // iterate with no ccaches if (!err) { err = cc_context_new_ccache_iterator(context, &iterator); @@ -29,7 +29,7 @@ int check_cc_ccache_iterator_next(void) { cc_ccache_iterator_release(iterator); iterator = NULL; } - + // iterate with one ccache if (!err) { destroy_all_ccaches(context); @@ -47,14 +47,14 @@ int check_cc_ccache_iterator_next(void) { cc_ccache_iterator_release(iterator); iterator = NULL; } - + // iterate with several ccaches if (!err) { destroy_all_ccaches(context); } for(i = 0; !err && (i < 1000); i++) { - if (i%100 == 0) fprintf(stdout, "."); + if (i%100 == 0) fprintf(stdout, "."); err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); if (ccache) { cc_ccache_release(ccache); @@ -69,15 +69,15 @@ int check_cc_ccache_iterator_next(void) { cc_ccache_iterator_release(iterator); iterator = NULL; } - + if (ccache) { cc_ccache_release(ccache); } if (iterator) { cc_ccache_iterator_release(iterator); } - if (context) { + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + END_TEST_AND_RETURN } @@ -87,11 +87,11 @@ cc_int32 check_once_cc_ccache_iterator_next(cc_ccache_iterator_t iterator, cc_ui // BEGIN_CHECK_ONCE(description); cc_int32 possible_return_values[6] = { - ccNoError, - ccIteratorEnd, - ccErrBadParam, - ccErrNoMem, - ccErrInvalidCCacheIterator, + ccNoError, + ccIteratorEnd, + ccErrBadParam, + ccErrNoMem, + ccErrInvalidCCacheIterator, ccErrCCacheNotFound, }; #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) @@ -110,15 +110,15 @@ cc_int32 check_once_cc_ccache_iterator_next(cc_ccache_iterator_t iterator, cc_ui if (err == ccIteratorEnd) { err = ccNoError; } - + // check returned error check_err(err, expected_err, possible_return_values); - + check_if(actual_count != expected_count, "iterator didn't iterate over all ccaches"); // END_CHECK_ONCE; - return err; + return err; } @@ -131,15 +131,15 @@ int check_cc_credentials_iterator_next(void) { cc_credentials_union creds_union; cc_credentials_iterator_t iterator = NULL; unsigned int i; - + BEGIN_TEST("cc_credentials_iterator_next"); - + err = cc_initialize(&context, ccapi_version_3, NULL, NULL); - + if (!err) { err = destroy_all_ccaches(context); } - + // iterate with no creds if (!err) { err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); @@ -156,7 +156,7 @@ int check_cc_credentials_iterator_next(void) { cc_ccache_release(ccache); ccache = NULL; } - + // iterate with one cred if (!err) { destroy_all_ccaches(context); @@ -179,14 +179,14 @@ int check_cc_credentials_iterator_next(void) { cc_ccache_release(ccache); ccache = NULL; } - + // iterate with several creds if (!err) { destroy_all_ccaches(context); err = cc_context_create_new_ccache(context, cc_credentials_v5, "foo@BAR.ORG", &ccache); } for(i = 0; !err && (i < 1000); i++) { - if (i%100 == 0) fprintf(stdout, "."); + if (i%100 == 0) fprintf(stdout, "."); new_v5_creds_union(&creds_union, "BAR.ORG"); err = cc_ccache_store_credentials(ccache, &creds_union); release_v5_creds_union(&creds_union); @@ -194,15 +194,15 @@ int check_cc_credentials_iterator_next(void) { if (!err) { err = cc_ccache_new_credentials_iterator(ccache, &iterator); } - check_once_cc_credentials_iterator_next(iterator, 1000, ccNoError, "iterating over a ccache with 1000 creds"); + check_once_cc_credentials_iterator_next(iterator, 1000, ccNoError, "iterating over a ccache with 1000 creds"); if (ccache) { cc_ccache_release(ccache); } if (iterator) { cc_credentials_iterator_release(iterator); } - if (context) { + if (context) { destroy_all_ccaches(context); cc_context_release(context); } - + END_TEST_AND_RETURN } @@ -212,10 +212,10 @@ cc_int32 check_once_cc_credentials_iterator_next(cc_credentials_iterator_t itera cc_uint32 actual_count = 0; cc_int32 possible_return_values[5] = { - ccNoError, - ccIteratorEnd, - ccErrBadParam, - ccErrNoMem, + ccNoError, + ccIteratorEnd, + ccErrBadParam, + ccErrNoMem, ccErrInvalidCredentialsIterator, }; @@ -234,13 +234,13 @@ cc_int32 check_once_cc_credentials_iterator_next(cc_credentials_iterator_t itera if (err == ccIteratorEnd) { err = ccNoError; } - + // check returned error check_err(err, expected_err, possible_return_values); - + check_if(actual_count != expected_count, "iterator didn't iterate over all ccaches"); END_CHECK_ONCE; - return err; + return err; } diff --git a/src/ccapi/test/test_ccapi_log.c b/src/ccapi/test/test_ccapi_log.c index 348d55cdc..8ecb6931f 100644 --- a/src/ccapi/test/test_ccapi_log.c +++ b/src/ccapi/test/test_ccapi_log.c @@ -15,7 +15,7 @@ void _log_error_v(const char *file, int line, const char *format, va_list ap) } void _log_error(const char *file, int line, const char *format, ...) -{ +{ va_list ap; va_start(ap, format); _log_error_v(file, line, format, ap); @@ -36,7 +36,7 @@ void test_footer(const char *msg, int err) { } else { fprintf(stdout, "\n*** %d failure%s in %s ***\n", err, (err == 1) ? "" : "s", msg); - } + } } } diff --git a/src/ccapi/test/test_ccapi_util.c b/src/ccapi/test/test_ccapi_util.c index 1f66c991b..9af1a6b63 100644 --- a/src/ccapi/test/test_ccapi_util.c +++ b/src/ccapi/test/test_ccapi_util.c @@ -14,7 +14,7 @@ cc_int32 destroy_all_ccaches(cc_context_t context) { cc_int32 err = ccNoError; cc_ccache_t ccache = NULL; - + while (!err) { err = cc_context_open_default_ccache(context, &ccache); if (!err) { @@ -42,9 +42,9 @@ cc_int32 new_v5_creds_union (cc_credentials_union *out_union, const char *realm) static int num_runs = 1; char *client = NULL; char *server = NULL; - + if (!out_union) { err = ccErrBadParam; } - + if (!err) { v5creds = malloc (sizeof (*v5creds)); if (!v5creds) { @@ -81,22 +81,22 @@ cc_int32 new_v5_creds_union (cc_credentials_union *out_union, const char *realm) v5creds->second_ticket.data = NULL; v5creds->authdata = NULL; } - - + + if (!err) { cred_union = malloc (sizeof (*cred_union)); - if (cred_union) { + if (cred_union) { cred_union->version = cc_credentials_v5; cred_union->credentials.credentials_v5 = v5creds; - } else { - err = ccErrNoMem; + } else { + err = ccErrNoMem; } } if (!err) { *out_union = *cred_union; cred_union = NULL; } - + return err; } @@ -105,7 +105,7 @@ cc_int32 new_v5_creds_union (cc_credentials_union *out_union, const char *realm) void release_v5_creds_union(cc_credentials_union *creds_union) { cc_credentials_v5_t *v5creds = NULL; - + if (creds_union) { if (creds_union->credentials.credentials_v5) { v5creds = creds_union->credentials.credentials_v5; @@ -115,7 +115,7 @@ void release_v5_creds_union(cc_credentials_union *creds_union) { if (v5creds->ticket.data) { free(v5creds->ticket.data); } if (v5creds->second_ticket.data) { free(v5creds->second_ticket.data); } free(v5creds); - } + } //free(creds_union); } } @@ -127,16 +127,16 @@ void release_v5_creds_union(cc_credentials_union *creds_union) { int compare_v5_creds_unions(const cc_credentials_union *a, const cc_credentials_union *b) { int retval = -1; - - if (a && + + if (a && b && (a->version == cc_credentials_v5) && - (a->version == b->version) && - (strcmp(a->credentials.credentials_v5->client, b->credentials.credentials_v5->client) == 0) && - (strcmp(a->credentials.credentials_v5->server, b->credentials.credentials_v5->server) == 0)) + (a->version == b->version) && + (strcmp(a->credentials.credentials_v5->client, b->credentials.credentials_v5->client) == 0) && + (strcmp(a->credentials.credentials_v5->server, b->credentials.credentials_v5->server) == 0)) { retval = 0; } - + return retval; } diff --git a/src/ccapi/test/test_ccapi_v2.c b/src/ccapi/test/test_ccapi_v2.c index 054d216e6..9d9a7a56f 100644 --- a/src/ccapi/test/test_ccapi_v2.c +++ b/src/ccapi/test/test_ccapi_v2.c @@ -12,23 +12,23 @@ static cc_result destroy_all_ccaches_v2(apiCB *context) { cc_result err = CC_NOERROR; infoNC **info = NULL; int i = 0; - + err = cc_get_NC_info(context, &info); - + for (i = 0; !err && info[i]; i++) { ccache_p *ccache = NULL; - + err = cc_open(context, info[i]->name, info[i]->vers, 0, &ccache); - + if (!err) { cc_destroy(context, &ccache); } } - + if (info) { cc_free_NC_info(context, &info); } - + if (err) { log_error("cc_get_NC_info or cc_open failed with %s (%d)", translate_ccapi_error(err), err); } - + return err; } @@ -37,31 +37,31 @@ static cc_result destroy_all_ccaches_v2(apiCB *context) { static int compare_v5_creds_unions_compat(const cred_union *a, const cred_union *b) { int retval = -1; - + if (a && b && a->cred_type == b->cred_type) { if (a->cred_type == CC_CRED_V5) { - if (!strcmp(a->cred.pV5Cred->client, b->cred.pV5Cred->client) && + if (!strcmp(a->cred.pV5Cred->client, b->cred.pV5Cred->client) && !strcmp(a->cred.pV5Cred->server, b->cred.pV5Cred->server) && a->cred.pV5Cred->starttime == b->cred.pV5Cred->starttime) { retval = 0; } } else if (a->cred_type == CC_CRED_V4) { - if (!strcmp (a->cred.pV4Cred->principal, + if (!strcmp (a->cred.pV4Cred->principal, b->cred.pV4Cred->principal) && - !strcmp (a->cred.pV4Cred->principal_instance, + !strcmp (a->cred.pV4Cred->principal_instance, b->cred.pV4Cred->principal_instance) && - !strcmp (a->cred.pV4Cred->service, + !strcmp (a->cred.pV4Cred->service, b->cred.pV4Cred->service) && - !strcmp (a->cred.pV4Cred->service_instance, + !strcmp (a->cred.pV4Cred->service_instance, b->cred.pV4Cred->service_instance) && - !strcmp (a->cred.pV4Cred->realm, + !strcmp (a->cred.pV4Cred->realm, b->cred.pV4Cred->realm) && a->cred.pV4Cred->issue_date == b->cred.pV4Cred->issue_date) { retval = 0; - } + } } } - + return retval; } @@ -75,16 +75,16 @@ static cc_result new_v5_creds_union_compat (cred_union *out_union, const char *r static int num_runs = 1; char *client = NULL; char *server = NULL; - + if (!out_union) { err = CC_BAD_PARM; } - + if (!err) { v5creds = malloc (sizeof (*v5creds)); if (!v5creds) { err = CC_NOMEM; } } - + if (!err) { asprintf(&client, "client@%s", realm); asprintf(&server, "host/%d%s@%s", num_runs++, realm, realm); @@ -92,7 +92,7 @@ static cc_result new_v5_creds_union_compat (cred_union *out_union, const char *r err = CC_NOMEM; } } - + if (!err) { v5creds->client = client; v5creds->server = server; @@ -114,22 +114,22 @@ static cc_result new_v5_creds_union_compat (cred_union *out_union, const char *r v5creds->second_ticket.data = NULL; v5creds->authdata = NULL; } - - + + if (!err) { creds_union = malloc (sizeof (*creds_union)); - if (creds_union) { + if (creds_union) { creds_union->cred_type = CC_CRED_V5; creds_union->cred.pV5Cred = v5creds; - } else { - err = CC_NOMEM; + } else { + err = CC_NOMEM; } } if (!err) { *out_union = *creds_union; creds_union = NULL; } - + return err; } @@ -137,7 +137,7 @@ static cc_result new_v5_creds_union_compat (cred_union *out_union, const char *r static void release_v5_creds_union_compat(cred_union *creds_union) { cc_credentials_v5_compat *v5creds = NULL; - + if (creds_union) { if (creds_union->cred.pV5Cred) { v5creds = creds_union->cred.pV5Cred; @@ -147,7 +147,7 @@ static void release_v5_creds_union_compat(cred_union *creds_union) { if (v5creds->ticket.data) { free(v5creds->ticket.data); } if (v5creds->second_ticket.data) { free(v5creds->second_ticket.data); } free(v5creds); - } + } } } @@ -156,56 +156,56 @@ static void release_v5_creds_union_compat(cred_union *creds_union) { int check_cc_shutdown(void) { cc_result err = 0; apiCB *context = NULL; - + BEGIN_TEST("cc_shutdown"); - + // try with valid context err = check_once_cc_shutdown(&context, CC_NOERROR, NULL); - + // try with NULL err = check_once_cc_shutdown(NULL, CC_BAD_PARM, NULL); - + if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } cc_result check_once_cc_shutdown(apiCB **out_context, cc_result expected_err, const char *description) { cc_result err = 0; apiCB *context = NULL; - + cc_result possible_return_values[2] = { - CC_NOERROR, - CC_BAD_PARM, + CC_NOERROR, + CC_BAD_PARM, }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (out_context) { err = cc_initialize(out_context, ccapi_version_2, NULL, NULL); - if (!err) { - context = *out_context; + if (!err) { + context = *out_context; } else { log_error("failure in cc_initialize, unable to perform check"); return err; } } - + if (!err) { err = cc_shutdown(&context); // check returned error check_err(err, expected_err, possible_return_values); } - + if (out_context) { *out_context = NULL; } - + END_CHECK_ONCE; - + return err; } @@ -217,29 +217,29 @@ int check_cc_get_change_time(void) { cc_time_t last_change_time = 0; ccache_p *ccache = NULL; cred_union creds_union; - + BEGIN_TEST("cc_get_change_time"); - + /* * Make a context * make sure the change time changes after: - * a ccache is created - * a ccache is destroyed - * a credential is stored - * a credential is removed - * a ccache principal is changed + * a ccache is created + * a ccache is destroyed + * a credential is stored + * a credential is removed + * a ccache principal is changed * clean up memory */ - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); if (!err) { - + // try bad parameters first err = check_once_cc_get_change_time(context, NULL, CC_BAD_PARM, "NULL param, should fail"); - + // get_change_time should always give something > 0 check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "first-run, should be > 0"); - + // create a ccache err = cc_create(context, "TEST_CCACHE", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); if (err) { @@ -247,7 +247,7 @@ int check_cc_get_change_time(void) { failure_count++; } check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "after creating a new ccache"); - + if (!err) { // change principal err = cc_set_principal(context, ccache, CC_CRED_V5, "foo@BAR.ORG"); @@ -258,7 +258,7 @@ int check_cc_get_change_time(void) { } } check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "after changing a principle"); - + new_v5_creds_union_compat(&creds_union, "BAR.ORG"); // store a credential @@ -271,7 +271,7 @@ int check_cc_get_change_time(void) { } } check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "after storing a credential"); - + // remove a credential if (!err) { err = cc_remove_cred(context, ccache, creds_union); @@ -281,19 +281,19 @@ int check_cc_get_change_time(void) { err = CC_NOERROR; } } - check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "after removing a credential"); + check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "after removing a credential"); release_v5_creds_union_compat(&creds_union); - + if (ccache) { // destroy a ccache err = cc_destroy(context, &ccache); check_once_cc_get_change_time(context, &last_change_time, CC_NOERROR, "after destroying a ccache"); } } - + if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -303,33 +303,33 @@ cc_int32 check_once_cc_get_change_time(apiCB *context, cc_time_t *last_time, cc_ cc_result err = 0; cc_time_t last_change_time; cc_time_t current_change_time = 0; - + cc_result possible_return_values[3] = { - CC_NOERROR, - CC_BAD_PARM, + CC_NOERROR, + CC_BAD_PARM, CC_NO_EXIST, }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (last_time != NULL) { // if we were passed NULL, then we're looking to pass a bad param err = cc_get_change_time(context, ¤t_change_time); } else { err = cc_get_change_time(context, NULL); } - + check_err(err, expected_err, possible_return_values); - + if (!err) { last_change_time = *last_time; check_if(current_change_time <= last_change_time, "context change time did not increase when it was supposed to (%d <= %d)", current_change_time, last_change_time); *last_time = current_change_time; } - + END_CHECK_ONCE; - + return err; } @@ -340,11 +340,11 @@ int check_cc_open(void) { apiCB *context = NULL; ccache_p *ccache = NULL; char *name = "TEST_OPEN_CCACHE"; - + BEGIN_TEST("cc_open"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - if (!err) { + if (!err) { // create a ccache err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); if (err) { @@ -355,12 +355,12 @@ int check_cc_open(void) { err = cc_close(context, &ccache); ccache = NULL; } - + // try default ccache if (!err) { err = check_once_cc_open(context, name, CC_CRED_V5, &ccache, CC_NOERROR, NULL); } - + // check version if (!err) { err = check_once_cc_open(context, name, CC_CRED_V4, &ccache, CC_ERR_CRED_VERSION, NULL); @@ -370,10 +370,10 @@ int check_cc_open(void) { err = check_once_cc_open(context, name, CC_CRED_V5, NULL, CC_BAD_PARM, NULL); err = check_once_cc_open(context, name, CC_CRED_UNKNOWN, &ccache, CC_ERR_CRED_VERSION, NULL); } - + if (context) { cc_shutdown(&context); } - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } // --------------------------------------------------------------------------- @@ -381,48 +381,48 @@ int check_cc_open(void) { cc_result check_once_cc_open(apiCB *context, const char *name, cc_int32 version, ccache_p **ccache, cc_result expected_err, const char *description) { cc_result err = 0; char *stored_name = NULL; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_BAD_PARM, + CC_NOERROR, + CC_BAD_PARM, CC_NO_EXIST, CC_NOMEM, CC_ERR_CRED_VERSION }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (ccache != NULL) { // if we were passed NULL, then we're looking to pass a bad param err = cc_open(context, name, version, 0, ccache); } else { err = cc_open(context, name, version, 0, NULL); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(*ccache == NULL, NULL); - + if (!err) { err = cc_get_name(context, *ccache, &stored_name); } - if (!err) { - check_if(strcmp(stored_name, name), NULL); + if (!err) { + check_if(strcmp(stored_name, name), NULL); } if (stored_name) { cc_free_name(context, &stored_name); } - - + + if (ccache && *ccache) { cc_ccache_release(*ccache); *ccache = NULL; } } - + END_CHECK_ONCE; - + return err; } @@ -433,11 +433,11 @@ int check_cc_create(void) { apiCB *context = NULL; ccache_p *ccache = NULL; char *name = "TEST_CC_CREATE"; - + BEGIN_TEST("cc_create"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - if (!err) { + if (!err) { if (!err) { err = cc_open(context, name, CC_CRED_V5, 0, &ccache); if (!err) { @@ -450,22 +450,22 @@ int check_cc_create(void) { if (!err) { err = check_once_cc_create(context, name, CC_CRED_V5, "foo@BAR.ORG", &ccache, CC_NOERROR, NULL); } - + // try making a ccache with a non-unique name (the existing cache's name) if (!err) { err = check_once_cc_create(context, name, CC_CRED_V5, "foo/baz@BAR.ORG", &ccache, CC_NOERROR, NULL); } - + // try bad parameters err = check_once_cc_create(context, NULL, CC_CRED_V5, "foo@BAR.ORG", &ccache, CC_BAD_PARM, "NULL name"); // NULL name err = check_once_cc_create(context, "name", CC_CRED_MAX, "foo@BAR.ORG", &ccache, CC_ERR_CRED_VERSION, "invalid creds_vers"); // invalid creds_vers err = check_once_cc_create(context, "name", CC_CRED_V5, NULL, &ccache, CC_BAD_PARM, "NULL principal"); // NULL principal err = check_once_cc_create(context, "name", CC_CRED_V5, "foo@BAR.ORG", NULL, CC_BAD_PARM, "NULL ccache"); // NULL ccache } - + if (ccache) { cc_destroy(context, &ccache); } if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -476,27 +476,27 @@ cc_result check_once_cc_create(apiCB *context, const char *name, cc_int32 cred_ char *stored_name = NULL; char *stored_principal = NULL; cc_int32 stored_creds_vers = 0; - + cc_result possible_return_values[6] = { - CC_NOERROR, - CC_BADNAME, - CC_BAD_PARM, - CC_NO_EXIST, - CC_NOMEM, - CC_ERR_CRED_VERSION, + CC_NOERROR, + CC_BADNAME, + CC_BAD_PARM, + CC_NO_EXIST, + CC_NOMEM, + CC_ERR_CRED_VERSION, }; BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_create(context, name, principal, cred_vers, 0, ccache); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(*ccache == NULL, NULL); - + // make sure all of the ccache's info matches what we gave it // name err = cc_get_name(context, *ccache, &stored_name); @@ -509,15 +509,15 @@ cc_result check_once_cc_create(apiCB *context, const char *name, cc_int32 cred_ err = cc_get_principal(context, *ccache, &stored_principal); if (!err) { check_if(strcmp(stored_principal, principal), NULL); } if (stored_principal) { cc_free_principal(context, &stored_principal); } - + if (ccache && *ccache) { cc_destroy(context, ccache); *ccache = NULL; } } - + END_CHECK_ONCE; - + return err; } @@ -528,22 +528,22 @@ int check_cc_close(void) { apiCB *context = NULL; ccache_p *ccache = NULL; char *name = "TEST_CC_CLOSE"; - + BEGIN_TEST("cc_close"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } - + if (!err) { check_once_cc_close(context, ccache, CC_NOERROR, NULL); ccache = NULL; } - + if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -551,36 +551,36 @@ int check_cc_close(void) { cc_result check_once_cc_close(apiCB *context, ccache_p *ccache, cc_result expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[2] = { CC_NOERROR, - CC_BAD_PARM + CC_BAD_PARM }; - + char *name = NULL; - + err = cc_get_name(context, ccache, &name); err = cc_close(context, &ccache); ccache = NULL; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err && name) { // try opening released ccache to make sure it still exists err = cc_open(context, name, CC_CRED_V5, 0, &ccache); } check_if(err == CC_NO_EXIST, "released ccache was actually destroyed instead"); check_if(err != CC_NOERROR, "released ccache cannot be opened"); - + if (ccache) { cc_destroy(context, &ccache); } if (name) { cc_free_name(context, &name); } - + END_CHECK_ONCE; - + return err; } @@ -591,22 +591,22 @@ int check_cc_destroy(void) { apiCB *context = NULL; ccache_p *ccache = NULL; char *name = "TEST_CC_DESTROY"; - + BEGIN_TEST("cc_destroy"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } - + if (!err) { check_once_cc_destroy(context, ccache, CC_NOERROR, NULL); ccache = NULL; } - + if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -614,39 +614,39 @@ int check_cc_destroy(void) { cc_result check_once_cc_destroy(apiCB *context, ccache_p *ccache, cc_int32 expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[2] = { - CC_NOERROR, - CC_BAD_PARM, + CC_NOERROR, + CC_BAD_PARM, }; - + char *name = NULL; - + BEGIN_CHECK_ONCE(description); - + #ifdef cc_ccache_destroy - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_get_name(context, ccache, &name); err = cc_destroy(context, &ccache); ccache = NULL; - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err && name) { // try opening released ccache to make sure it still exists err = cc_open(context, name, CC_CRED_V5, 0, &ccache); } check_if(err != CC_NO_EXIST, "destroyed ccache was actually released instead"); - + if (ccache) { cc_destroy(context, &ccache); } if (name) { cc_free_name(context, &name); } - + #endif /* cc_ccache_destroy */ - + END_CHECK_ONCE; - + return err; } @@ -657,11 +657,11 @@ int check_cc_get_cred_version(void) { apiCB *context = NULL; ccache_p *ccache = NULL; char *name = "TEST_CC_GET_CRED_VERSION_V5"; - + BEGIN_TEST("cc_get_cred_version"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + // try one created with v5 creds if (!err) { err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); @@ -673,14 +673,14 @@ int check_cc_get_cred_version(void) { log_error("cc_context_create_new_ccache failed, can't complete test"); failure_count++; } - + if (ccache) { cc_destroy(context, &ccache); ccache = NULL; } - + err = CC_NOERROR; - + // try one created with v4 creds if (!err) { err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V4, 0, &ccache); @@ -696,9 +696,9 @@ int check_cc_get_cred_version(void) { cc_destroy(context, &ccache); ccache = NULL; } - + if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -706,30 +706,30 @@ int check_cc_get_cred_version(void) { cc_result check_once_cc_get_cred_version(apiCB *context, ccache_p *ccache, cc_int32 expected_cred_vers, cc_int32 expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[3] = { - CC_NOERROR, - CC_BAD_PARM, - CC_NO_EXIST, + CC_NOERROR, + CC_BAD_PARM, + CC_NO_EXIST, }; - + cc_int32 stored_cred_vers = 0; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_get_cred_version(context, ccache, &stored_cred_vers); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(stored_cred_vers != expected_cred_vers, NULL); } - + END_CHECK_ONCE; - + return err; } @@ -739,15 +739,15 @@ int check_cc_get_name(void) { cc_result err = 0; apiCB *context = NULL; ccache_p *ccache = NULL; - + BEGIN_TEST("cc_get_name"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + // try with unique ccache (which happens to be default) if (!err) { err = cc_create(context, "0", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); @@ -758,12 +758,12 @@ int check_cc_get_name(void) { else { log_error("cc_context_create_ccache failed, can't complete test"); failure_count++; - } + } if (ccache) { cc_close(context, &ccache); ccache = NULL; } - + // try with unique ccache (which is not default) if (!err) { err = cc_context_create_ccache(context, "1", CC_CRED_V5, "foo@BAR.ORG", &ccache); @@ -775,7 +775,7 @@ int check_cc_get_name(void) { log_error("cc_context_create_ccache failed, can't complete test"); failure_count++; } - + // try with bad param if (!err) { check_once_cc_get_name(context, ccache, NULL, CC_BAD_PARM, "NULL param"); @@ -784,51 +784,51 @@ int check_cc_get_name(void) { cc_close(context, &ccache); ccache = NULL; } - - if (context) { + + if (context) { err = destroy_all_ccaches_v2(context); cc_shutdown(&context); } - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } // --------------------------------------------------------------------------- cc_int32 check_once_cc_get_name(apiCB *context, ccache_p *ccache, const char *expected_name, cc_int32 expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[4] = { - CC_NOERROR, - CC_NOMEM, - CC_BAD_PARM, - CC_NO_EXIST, + CC_NOERROR, + CC_NOMEM, + CC_BAD_PARM, + CC_NO_EXIST, }; - + char *stored_name = NULL; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (expected_name == NULL) { // we want to try with a NULL param err = cc_get_name(context, ccache, NULL); } else { err = cc_get_name(context, ccache, &stored_name); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(strcmp(stored_name, expected_name), NULL); } - + if (stored_name) { cc_free_name(context, &stored_name); } - + END_CHECK_ONCE; - + return err; } @@ -841,15 +841,15 @@ int check_cc_get_principal(void) { ccache_p *ccache = NULL; char *name_v5 = "TEST_CC_GET_PRINCIPAL_V5"; char *name_v4 = "TEST_CC_GET_PRINCIPAL_V4"; - + BEGIN_TEST("cc_get_principal"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + // try with krb5 principal if (!err) { err = cc_create(context, name_v5, "foo/BAR@BAZ.ORG", CC_CRED_V5, 0, &ccache); @@ -865,7 +865,7 @@ int check_cc_get_principal(void) { cc_close(context, &ccache); ccache = NULL; } - + // try with krb4 principal if (!err) { err = cc_create(context, name_v4, "foo.BAR@BAZ.ORG", CC_CRED_V4, 0, &ccache); @@ -877,64 +877,64 @@ int check_cc_get_principal(void) { log_error("cc_create failed, can't complete test"); failure_count++; } - + // try with bad param if (!err) { check_once_cc_get_principal(context, ccache, NULL, CC_BAD_PARM, "passed null out param"); } - + if (ccache) { cc_close(context, &ccache); ccache = NULL; } - - if (context) { + + if (context) { err = destroy_all_ccaches_v2(context); cc_shutdown(&context); } - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } // --------------------------------------------------------------------------- -cc_result check_once_cc_get_principal(apiCB *context, - ccache_p *ccache, - const char *expected_principal, - cc_int32 expected_err, +cc_result check_once_cc_get_principal(apiCB *context, + ccache_p *ccache, + const char *expected_principal, + cc_int32 expected_err, const char *description) { cc_result err = CC_NOERROR; char *stored_principal = NULL; - + cc_result possible_return_values[4] = { - CC_NOERROR, - CC_NOMEM, - CC_NO_EXIST, + CC_NOERROR, + CC_NOMEM, + CC_NO_EXIST, CC_BAD_PARM }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + if (expected_principal == NULL) { // we want to try with a NULL param err = cc_get_principal(context, ccache, NULL); } else { err = cc_get_principal(context, ccache, &stored_principal); } - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { check_if(strcmp(stored_principal, expected_principal), "expected princ == \"%s\" stored princ == \"%s\"", expected_principal, stored_principal); } - + if (stored_principal) { cc_free_principal(context, &stored_principal); } - + END_CHECK_ONCE; - + return err; } @@ -946,15 +946,15 @@ int check_cc_set_principal(void) { ccache_p *ccache = NULL; char *name_v5 = "TEST_CC_GET_PRINCIPAL_V5"; char *name_v4 = "TEST_CC_GET_PRINCIPAL_V4"; - + BEGIN_TEST("cc_set_principal"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + // bad params if (!err) { err = cc_create(context, name_v5, "foo@BAZ.ORG", CC_CRED_V5, 0, &ccache); @@ -971,9 +971,9 @@ int check_cc_set_principal(void) { cc_destroy(context, &ccache); ccache = NULL; } - + // empty ccache - + // replace v5 ccache's principal if (!err) { err = cc_create(context, name_v5, "foo@BAZ.ORG", CC_CRED_V5, 0, &ccache); @@ -990,7 +990,7 @@ int check_cc_set_principal(void) { cc_destroy(context, &ccache); ccache = NULL; } - + // replace v4 ccache's principal if (!err) { err = cc_create(context, name_v4, "foo@BAZ.ORG", CC_CRED_V4, 0, &ccache); @@ -1007,13 +1007,13 @@ int check_cc_set_principal(void) { cc_destroy(context, &ccache); ccache = NULL; } - - if (context) { + + if (context) { err = destroy_all_ccaches_v2(context); cc_shutdown(&context); } - - END_TEST_AND_RETURN + + END_TEST_AND_RETURN } // --------------------------------------------------------------------------- @@ -1021,37 +1021,37 @@ int check_cc_set_principal(void) { cc_int32 check_once_cc_set_principal(apiCB *context, ccache_p *ccache, cc_int32 cred_vers, const char *in_principal, cc_int32 expected_err, const char *description) { cc_result err = CC_NOERROR; char *stored_principal = NULL; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_NOMEM, - CC_NO_EXIST, - CC_ERR_CRED_VERSION, + CC_NOERROR, + CC_NOMEM, + CC_NO_EXIST, + CC_ERR_CRED_VERSION, CC_BAD_PARM }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_set_principal(context, ccache, cred_vers, (char *) in_principal); - + // check returned error check_err(err, expected_err, possible_return_values); - + if (!err) { err = cc_get_principal(context, ccache, &stored_principal); } - + // compare stored with input if (!err) { check_if(strcmp(stored_principal, in_principal), "expected princ == \"%s\" stored princ == \"%s\"", in_principal, stored_principal); } - + if (stored_principal) { cc_free_principal(context, &stored_principal); } - + END_CHECK_ONCE; - + return err; } @@ -1064,61 +1064,61 @@ int check_cc_store(void) { ccache_p *dup_ccache = NULL; cred_union creds_union; char *name = NULL; - + BEGIN_TEST("cc_store"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + if (!err) { err = cc_create(context, "TEST_CC_STORE", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } - + // cred with matching version and realm if (!err) { err = new_v5_creds_union_compat(&creds_union, "BAR.ORG"); - + if (!err) { check_once_cc_store(context, ccache, creds_union, CC_NOERROR, "ok creds"); release_v5_creds_union_compat(&creds_union); } } - + // invalid creds if (!err) { err = new_v5_creds_union_compat(&creds_union, "BAR.ORG"); - + if (!err) { if (creds_union.cred.pV5Cred->client) { free(creds_union.cred.pV5Cred->client); creds_union.cred.pV5Cred->client = NULL; } check_once_cc_store(context, ccache, creds_union, CC_BAD_PARM, "invalid creds (NULL client string)"); - + release_v5_creds_union_compat(&creds_union); } } - + // bad creds version if (!err) { err = new_v5_creds_union_compat(&creds_union, "BAR.ORG"); - + if (!err) { creds_union.cred_type = CC_CRED_MAX; check_once_cc_store(context, ccache, creds_union, CC_ERR_CRED_VERSION, "CC_CRED_MAX (invalid) into a ccache with only v5 princ"); creds_union.cred_type = CC_CRED_V4; check_once_cc_store(context, ccache, creds_union, CC_ERR_CRED_VERSION, "v4 creds into a v5 ccache"); creds_union.cred_type = CC_CRED_V5; - + release_v5_creds_union_compat(&creds_union); } } - + // non-existent ccache - if (ccache) { + if (ccache) { err = cc_get_name(context, ccache, &name); if (!err) { err = cc_open(context, name, CC_CRED_V5, 0, &dup_ccache); @@ -1126,23 +1126,23 @@ int check_cc_store(void) { if (name) { cc_free_name(context, &name); } if (dup_ccache) { cc_destroy(context, &dup_ccache); } } - + if (!err) { err = new_v5_creds_union_compat(&creds_union, "BAR.ORG"); - + if (!err) { check_once_cc_store(context, ccache, creds_union, CC_NO_EXIST, "invalid ccache"); - + release_v5_creds_union_compat(&creds_union); } } - + if (ccache) { cc_close(context, &ccache); } - if (context) { + if (context) { destroy_all_ccaches_v2(context); cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -1152,24 +1152,24 @@ cc_result check_once_cc_store(apiCB *context, ccache_p *ccache, const cred_union cc_result err = CC_NOERROR; ccache_cit *iterator = NULL; int found = 0; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_BAD_PARM, - CC_ERR_CACHE_FULL, - CC_ERR_CRED_VERSION, - CC_NO_EXIST + CC_NOERROR, + CC_BAD_PARM, + CC_ERR_CACHE_FULL, + CC_ERR_CRED_VERSION, + CC_NO_EXIST }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_store(context, ccache, in_creds); - + // check returned error check_err(err, expected_err, possible_return_values); - + // make sure credentials were truly stored if (!err) { err = cc_seq_fetch_creds_begin(context, ccache, &iterator); @@ -1181,19 +1181,19 @@ cc_result check_once_cc_store(apiCB *context, ccache_p *ccache, const cred_union if (!err) { found = !compare_v5_creds_unions_compat(&in_creds, creds); } - + if (creds) { cc_free_creds(context, &creds); } } - - if (err == CC_END) { + + if (err == CC_END) { check_if(found, "stored credentials not found in ccache"); err = CC_NOERROR; } - + if (iterator) { cc_seq_fetch_creds_end(context, &iterator); } - + END_CHECK_ONCE; - + return err; } @@ -1207,19 +1207,19 @@ int check_cc_remove_cred(void) { ccache_cit *iterator = NULL; char *name = NULL; unsigned int i; - + BEGIN_TEST("cc_remove_cred"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + if (!err) { err = cc_create(context, "TEST_CC_REMOVE_CRED", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } - + // store 10 creds and retrieve their cc_credentials_t representations for(i = 0; !err && (i < 10); i++) { cred_union creds; @@ -1231,55 +1231,55 @@ int check_cc_remove_cred(void) { } release_v5_creds_union_compat(&creds); } - + if (!err) { err = cc_seq_fetch_creds_begin(context, ccache, &iterator); } - + for (i = 0; !err && i < 10; i++) { creds_array[i] = NULL; err = cc_seq_fetch_creds_next(context, &creds_array[i], iterator); } if (err == CC_END) { err = CC_NOERROR; } - + // remove 10 valid creds for (i = 0; !err && (i < 10); i++) { check_once_cc_remove_cred(context, ccache, *creds_array[i], CC_NOERROR, "10 ok creds"); } - + // non-existent creds (remove same one twice) check_once_cc_remove_cred(context, ccache, *creds_array[0], CC_NOTFOUND, "removed same creds twice"); - + // non-existent ccache - if (ccache) { + if (ccache) { ccache_p *dup_ccache = NULL; err = cc_get_name(context, ccache, &name); - + if (!err) { err = cc_open(context, name, CC_CRED_V5, 0, &dup_ccache); } - + if (!err) { err = cc_destroy(context, &dup_ccache); check_once_cc_remove_cred(context, ccache, *creds_array[0], CC_NO_EXIST, "invalid ccache"); } - + if (name) { cc_free_name(context, &name); } } - + for(i = 0; i < 10 && creds_array[i]; i++) { cc_free_creds(context, &creds_array[i]); } - - + + if (iterator) { cc_seq_fetch_creds_end(context, &iterator); iterator = NULL; } if (ccache) { cc_close(context, &ccache); } - if (context) { + if (context) { destroy_all_ccaches_v2(context); cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -1289,49 +1289,49 @@ cc_result check_once_cc_remove_cred(apiCB *context, ccache_p *ccache, cred_union cc_result err = CC_NOERROR; ccache_cit *iterator = NULL; int found = 0; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_BAD_PARM, - CC_ERR_CRED_VERSION, - CC_NOTFOUND, + CC_NOERROR, + CC_BAD_PARM, + CC_ERR_CRED_VERSION, + CC_NOTFOUND, CC_NO_EXIST }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_remove_cred(context, ccache, in_creds); - + // check returned error check_err(err, expected_err, possible_return_values); - + // make sure credentials were truly stored if (!err) { err = cc_seq_fetch_creds_begin(context, ccache, &iterator); } - + while (!err && !found) { cred_union *creds = NULL; - + err = cc_seq_fetch_creds_next(context, &creds, iterator); if (!err) { found = !compare_v5_creds_unions_compat(&in_creds, creds); } - + if (creds) { cc_free_creds(context, &creds); } } - - if (err == CC_END) { + + if (err == CC_END) { check_if(found, "credentials not removed from ccache"); err = CC_NOERROR; } - + if (iterator) { cc_seq_fetch_creds_end(context, &iterator); } - + END_CHECK_ONCE; - + return err; } @@ -1342,31 +1342,31 @@ int check_cc_seq_fetch_NCs_begin(void) { apiCB *context = NULL; ccache_p *ccache = NULL; ccache_cit *iterator = NULL; - + BEGIN_TEST("cc_seq_fetch_NCs_begin"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - if (!err) { + if (!err) { err = destroy_all_ccaches_v2(context); } - if (!err) { + if (!err) { // try making when there are no existing ccaches (shouldn't make a difference, but just in case) check_once_cc_seq_fetch_NCs_begin(context, &iterator, CC_NOERROR, "when there are no existing ccaches"); - + err = cc_create(context, "TEST_CC_SEQ_FETCH_NCS_BEGIN", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } - if (!err) { + if (!err) { // try making when at least one ccache already exists (just to cover all our bases) check_once_cc_seq_fetch_NCs_begin(context, &iterator, CC_NOERROR, "when at least one ccache already exists"); - + // try bad parameters check_once_cc_seq_fetch_NCs_begin(context, NULL, CC_BAD_PARM, "NULL param"); // NULL iterator } // we'll do a comprehensive test of cc_ccache_iterator related functions later in the test suite - + if (ccache ) { cc_close(context, &ccache); } if (context) { cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -1374,25 +1374,25 @@ int check_cc_seq_fetch_NCs_begin(void) { cc_result check_once_cc_seq_fetch_NCs_begin(apiCB *context, ccache_cit **iterator, cc_result expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[4] = { - CC_NOERROR, - CC_BAD_PARM, - CC_NOMEM, - CC_NO_EXIST + CC_NOERROR, + CC_BAD_PARM, + CC_NOMEM, + CC_NO_EXIST }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_seq_fetch_NCs_begin(context, iterator); - + // check returned error check_err(err, expected_err, possible_return_values); - + // we'll do a comprehensive test of cc_ccache_iterator related functions later - + return err; } @@ -1404,15 +1404,15 @@ int check_cc_seq_fetch_NCs_next(void) { ccache_p *ccache = NULL; ccache_cit *iterator = NULL; unsigned int i; - + BEGIN_TEST("cc_seq_fetch_NCs_next"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + // iterate with no ccaches if (!err) { err = cc_seq_fetch_NCs_begin(context, &iterator); @@ -1422,7 +1422,7 @@ int check_cc_seq_fetch_NCs_next(void) { cc_seq_fetch_creds_end(context, &iterator); iterator = NULL; } - + // iterate with one ccache if (!err) { destroy_all_ccaches_v2(context); @@ -1440,7 +1440,7 @@ int check_cc_seq_fetch_NCs_next(void) { cc_seq_fetch_creds_end(context, &iterator); iterator = NULL; } - + // iterate with several ccaches if (!err) { destroy_all_ccaches_v2(context); @@ -1448,8 +1448,8 @@ int check_cc_seq_fetch_NCs_next(void) { for(i = 0; !err && (i < 1000); i++) { char *name = NULL; - - if (i%100 == 0) fprintf(stdout, "."); + + if (i%100 == 0) fprintf(stdout, "."); asprintf (&name, "TEST_CC_SEQ_FETCH_NCS_NEXT_%d", i); err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); if (ccache) { @@ -1466,15 +1466,15 @@ int check_cc_seq_fetch_NCs_next(void) { cc_seq_fetch_creds_end(context, &iterator); iterator = NULL; } - - + + if (ccache) { cc_close(context, &ccache); } if (iterator) { cc_seq_fetch_creds_end(context, &iterator); } - if (context) { + if (context) { destroy_all_ccaches_v2(context); cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -1482,21 +1482,21 @@ int check_cc_seq_fetch_NCs_next(void) { cc_result check_once_cc_seq_fetch_NCs_next(apiCB *context, ccache_cit *iterator, cc_uint32 expected_count, cc_result expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_END, - CC_BAD_PARM, - CC_NOMEM, + CC_NOERROR, + CC_END, + CC_BAD_PARM, + CC_NOMEM, CC_NO_EXIST }; #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + ccache_p *ccache = NULL; cc_uint32 actual_count = 0; - + BEGIN_CHECK_ONCE(description); - + while (!err) { err = cc_seq_fetch_NCs_next(context, &ccache, iterator); if (ccache) { @@ -1508,15 +1508,15 @@ cc_result check_once_cc_seq_fetch_NCs_next(apiCB *context, ccache_cit *iterator, if (err == CC_END) { err = CC_NOERROR; } - + // check returned error check_err(err, expected_err, possible_return_values); - + check_if(actual_count != expected_count, "iterator didn't iterate over all ccaches"); - + END_CHECK_ONCE; - - return err; + + return err; } // --------------------------------------------------------------------------- @@ -1526,18 +1526,18 @@ int check_cc_get_NC_info(void) { apiCB *context = NULL; ccache_p *ccache = NULL; unsigned int i; - + BEGIN_TEST("cc_get_NC_info"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + // iterate with no ccaches check_once_cc_get_NC_info(context, "", "", CC_CRED_MAX, 0, CC_NOERROR, "iterating over an empty collection"); - + // iterate with one ccache if (!err) { destroy_all_ccaches_v2(context); @@ -1548,7 +1548,7 @@ int check_cc_get_NC_info(void) { ccache = NULL; } check_once_cc_get_NC_info(context, "TEST_CC_GET_NC_INFO", "foo@BAR.ORG", CC_CRED_V5, 1, CC_NOERROR, "iterating over a collection of 1 ccache"); - + // iterate with several ccaches if (!err) { destroy_all_ccaches_v2(context); @@ -1556,8 +1556,8 @@ int check_cc_get_NC_info(void) { for(i = 0; !err && (i < 1000); i++) { char *name = NULL; - - if (i%100 == 0) fprintf(stdout, "."); + + if (i%100 == 0) fprintf(stdout, "."); asprintf (&name, "TEST_CC_GET_NC_INFO_%d", i); err = cc_create(context, name, "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); if (ccache) { @@ -1566,58 +1566,58 @@ int check_cc_get_NC_info(void) { } free (name); } - check_once_cc_get_NC_info(context, "TEST_CC_GET_NC_INFO", "foo@BAR.ORG", CC_CRED_V5, 1000, CC_NOERROR, "iterating over a collection of 1000 ccache"); - + check_once_cc_get_NC_info(context, "TEST_CC_GET_NC_INFO", "foo@BAR.ORG", CC_CRED_V5, 1000, CC_NOERROR, "iterating over a collection of 1000 ccache"); + if (ccache) { cc_close(context, &ccache); } - if (context) { + if (context) { destroy_all_ccaches_v2(context); cc_shutdown(&context); } - + END_TEST_AND_RETURN } // --------------------------------------------------------------------------- -cc_result check_once_cc_get_NC_info(apiCB *context, - const char *expected_name_prefix, - const char *expected_principal, - cc_int32 expected_version, - cc_uint32 expected_count, - cc_result expected_err, +cc_result check_once_cc_get_NC_info(apiCB *context, + const char *expected_name_prefix, + const char *expected_principal, + cc_int32 expected_version, + cc_uint32 expected_count, + cc_result expected_err, const char *description) { cc_result err = CC_NOERROR; infoNC **info = NULL; - + cc_result possible_return_values[4] = { CC_NOERROR, - CC_BAD_PARM, - CC_NOMEM, + CC_BAD_PARM, + CC_NOMEM, CC_NO_EXIST }; #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + cc_uint32 actual_count = 0; - + BEGIN_CHECK_ONCE(description); - + err = cc_get_NC_info(context, &info); - + for (actual_count = 0; !err && info[actual_count]; actual_count++) { check_if(strncmp(info[actual_count]->name, expected_name_prefix, strlen(expected_name_prefix)), "got incorrect ccache name"); check_if(strcmp(info[actual_count]->principal, expected_principal), "got incorrect principal name"); check_if(info[actual_count]->vers != expected_version, "got incorrect cred version"); } - + // check returned error check_err(err, expected_err, possible_return_values); - + check_if(actual_count != expected_count, "NC info didn't list all ccaches"); - + if (info) { cc_free_NC_info (context, &info); } END_CHECK_ONCE; - - return err; + + return err; } // --------------------------------------------------------------------------- @@ -1629,39 +1629,39 @@ int check_cc_seq_fetch_creds_begin(void) { ccache_p *dup_ccache = NULL; ccache_cit *creds_iterator = NULL; char *name = NULL; - + BEGIN_TEST("cc_seq_fetch_creds_begin"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + if (!err) { err = cc_create(context, "TEST_CC_SEQ_FETCH_CREDS_BEGIN", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } - + // valid params if (!err) { check_once_cc_seq_fetch_creds_begin(context, ccache, &creds_iterator, CC_NOERROR, "valid params"); } - if (creds_iterator) { - cc_seq_fetch_creds_end(context, &creds_iterator); + if (creds_iterator) { + cc_seq_fetch_creds_end(context, &creds_iterator); creds_iterator = NULL; } - + // NULL out param if (!err) { check_once_cc_seq_fetch_creds_begin(context, ccache, NULL, CC_BAD_PARM, "NULL out iterator param"); } - if (creds_iterator) { - cc_seq_fetch_creds_end(context, &creds_iterator); + if (creds_iterator) { + cc_seq_fetch_creds_end(context, &creds_iterator); creds_iterator = NULL; } - + // non-existent ccache - if (ccache) { + if (ccache) { err = cc_get_name(context, ccache, &name); if (!err) { err = cc_open(context, name, CC_CRED_V5, 0, &dup_ccache); @@ -1669,21 +1669,21 @@ int check_cc_seq_fetch_creds_begin(void) { if (name) { cc_free_name(context, &name); } if (dup_ccache) { cc_destroy(context, &dup_ccache); } } - + if (!err) { check_once_cc_seq_fetch_creds_begin(context, ccache, &creds_iterator, CC_NO_EXIST, "invalid ccache"); } - - if (creds_iterator) { - cc_seq_fetch_creds_end(context, &creds_iterator); + + if (creds_iterator) { + cc_seq_fetch_creds_end(context, &creds_iterator); creds_iterator = NULL; } if (ccache) { cc_close(context, &ccache); } - if (context) { + if (context) { destroy_all_ccaches_v2(context); cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -1691,25 +1691,25 @@ int check_cc_seq_fetch_creds_begin(void) { cc_result check_once_cc_seq_fetch_creds_begin(apiCB *context, ccache_p *ccache, ccache_cit **iterator, cc_result expected_err, const char *description) { cc_result err = CC_NOERROR; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_BAD_PARM, - CC_NOMEM, + CC_NOERROR, + CC_BAD_PARM, + CC_NOMEM, CC_NO_EXIST }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + err = cc_seq_fetch_creds_begin(context, ccache, iterator); - + // check returned error check_err(err, expected_err, possible_return_values); - + END_CHECK_ONCE; - + return err; } @@ -1722,15 +1722,15 @@ int check_cc_seq_fetch_creds_next(void) { cred_union creds_union; ccache_cit *iterator = NULL; unsigned int i; - + BEGIN_TEST("cc_seq_fetch_creds_next"); - + err = cc_initialize(&context, ccapi_version_2, NULL, NULL); - + if (!err) { err = destroy_all_ccaches_v2(context); } - + // iterate with no creds if (!err) { err = cc_create(context, "TEST_CC_SEQ_FETCH_CREDS_NEXT", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); @@ -1747,7 +1747,7 @@ int check_cc_seq_fetch_creds_next(void) { cc_close(context, &ccache); ccache = NULL; } - + // iterate with one cred if (!err) { destroy_all_ccaches_v2(context); @@ -1770,14 +1770,14 @@ int check_cc_seq_fetch_creds_next(void) { cc_close(context, &ccache); ccache = NULL; } - + // iterate with several creds if (!err) { destroy_all_ccaches_v2(context); err = cc_create(context, "TEST_CC_SEQ_FETCH_CREDS_NEXT", "foo@BAR.ORG", CC_CRED_V5, 0, &ccache); } for(i = 0; !err && (i < 1000); i++) { - if (i%100 == 0) fprintf(stdout, "."); + if (i%100 == 0) fprintf(stdout, "."); new_v5_creds_union_compat(&creds_union, "BAR.ORG"); err = cc_store(context, ccache, creds_union); release_v5_creds_union_compat(&creds_union); @@ -1785,15 +1785,15 @@ int check_cc_seq_fetch_creds_next(void) { if (!err) { err = cc_seq_fetch_creds_begin(context, ccache, &iterator); } - check_once_cc_seq_fetch_creds_next(context, iterator, 1000, CC_NOERROR, "iterating over a ccache with 1000 creds"); - + check_once_cc_seq_fetch_creds_next(context, iterator, 1000, CC_NOERROR, "iterating over a ccache with 1000 creds"); + if (ccache) { cc_close(context, &ccache); } if (iterator) { cc_seq_fetch_creds_end(context, &iterator); } - if (context) { + if (context) { destroy_all_ccaches_v2(context); cc_shutdown(&context); } - + END_TEST_AND_RETURN } @@ -1803,19 +1803,19 @@ cc_result check_once_cc_seq_fetch_creds_next(apiCB *context, ccache_cit *iterato cc_result err = CC_NOERROR; cred_union *creds = NULL; cc_uint32 actual_count = 0; - + cc_result possible_return_values[5] = { - CC_NOERROR, - CC_END, - CC_BAD_PARM, - CC_NOMEM, + CC_NOERROR, + CC_END, + CC_BAD_PARM, + CC_NOMEM, CC_NO_EXIST, }; - + BEGIN_CHECK_ONCE(description); - + #define possible_ret_val_count sizeof(possible_return_values)/sizeof(possible_return_values[0]) - + while (!err) { err = cc_seq_fetch_creds_next(context, &creds, iterator); if (creds) { @@ -1827,14 +1827,13 @@ cc_result check_once_cc_seq_fetch_creds_next(apiCB *context, ccache_cit *iterato if (err == CC_END) { err = CC_NOERROR; } - + // check returned error check_err(err, expected_err, possible_return_values); - + check_if(actual_count != expected_count, "iterator didn't iterate over all ccaches"); - + END_CHECK_ONCE; - - return err; -} + return err; +} diff --git a/src/ccapi/test/test_ccapi_v2.h b/src/ccapi/test/test_ccapi_v2.h index 55abdffde..8508daa45 100644 --- a/src/ccapi/test/test_ccapi_v2.h +++ b/src/ccapi/test/test_ccapi_v2.h @@ -34,10 +34,10 @@ int check_cc_get_name(void); cc_int32 check_once_cc_get_name(apiCB *context, ccache_p *ccache, const char *expected_name, cc_int32 expected_err, const char *description); int check_cc_get_principal(void); -cc_result check_once_cc_get_principal(apiCB *context, - ccache_p *ccache, - const char *expected_principal, - cc_int32 expected_err, +cc_result check_once_cc_get_principal(apiCB *context, + ccache_p *ccache, + const char *expected_principal, + cc_int32 expected_err, const char *description); int check_cc_set_principal(void); @@ -56,18 +56,18 @@ int check_cc_seq_fetch_NCs_next(void); cc_result check_once_cc_seq_fetch_NCs_next(apiCB *context, ccache_cit *iterator, cc_uint32 expected_count, cc_result expected_err, const char *description); int check_cc_get_NC_info(void); -cc_result check_once_cc_get_NC_info(apiCB *context, - const char *expected_name, - const char *expected_principal, - cc_int32 expected_version, - cc_uint32 expected_count, - cc_result expected_err, +cc_result check_once_cc_get_NC_info(apiCB *context, + const char *expected_name, + const char *expected_principal, + cc_int32 expected_version, + cc_uint32 expected_count, + cc_result expected_err, const char *description); int check_cc_seq_fetch_creds_begin(void); cc_result check_once_cc_seq_fetch_creds_begin(apiCB *context, ccache_p *ccache, ccache_cit **iterator, cc_result expected_err, const char *description); int check_cc_seq_fetch_creds_next(void); -cc_result check_once_cc_seq_fetch_creds_next(apiCB *context, ccache_cit *iterator, cc_uint32 expected_count, cc_result expected_err, const char *description); +cc_result check_once_cc_seq_fetch_creds_next(apiCB *context, ccache_cit *iterator, cc_uint32 expected_count, cc_result expected_err, const char *description); #endif /* _TEST_CCAPI_V2_H_ */ diff --git a/src/ccapi/test/test_constants.c b/src/ccapi/test/test_constants.c index 367baac4c..f4f272c4d 100644 --- a/src/ccapi/test/test_constants.c +++ b/src/ccapi/test/test_constants.c @@ -7,7 +7,7 @@ #include "test_ccapi_ccache.h" int main (int argc, const char * argv[]) { - + cc_int32 err = ccNoError; T_CCAPI_INIT; err = check_constants(); |
