From b218b3dcfa2c28ad7325d8da88f68aacb6568b92 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Wed, 9 Jul 2008 21:46:14 +0000 Subject: [PATCH] Don't print spurious errors to debug logs git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20508 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ccapi/server/ccs_ccache.c | 3 ++- src/ccapi/server/ccs_list_internal.c | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c index b35081feb..c2e36bf0b 100644 --- a/src/ccapi/server/ccs_ccache.c +++ b/src/ccapi/server/ccs_ccache.c @@ -447,7 +447,8 @@ cc_int32 ccs_ccache_find_credentials_iterator (ccs_ccache_t in_cc out_credentials_iterator); } - return cci_check_error (err); + // Don't report ccErrInvalidCredentials to the log file. Non-fatal. + return (err == ccErrInvalidCredentials) ? err : cci_check_error (err); } #ifdef TARGET_OS_MAC diff --git a/src/ccapi/server/ccs_list_internal.c b/src/ccapi/server/ccs_list_internal.c index 0066f36fd..07e5ee8d1 100644 --- a/src/ccapi/server/ccs_list_internal.c +++ b/src/ccapi/server/ccs_list_internal.c @@ -284,10 +284,11 @@ static cc_int32 ccs_list_find_iterator_index (ccs_list_t in_list, } if (!err && !found) { - err = cci_check_error (in_list->object_not_found_err); + // Don't report this error to the log file. Non-fatal. + return in_list->object_not_found_err; + } else { + return cci_check_error (err); } - - return cci_check_error (err); } /* ------------------------------------------------------------------------ */ @@ -565,7 +566,7 @@ cc_int32 ccs_list_iterator_release (ccs_list_iterator_t io_list_iterator) io_list_iterator->identifier, &i) == ccNoError) { /* cci_array_remove will call ccs_list_iterator_object_release */ - cci_array_remove (io_list_iterator->list->iterators, i); + err = cci_array_remove (io_list_iterator->list->iterators, i); } else { cci_debug_printf ("Warning: iterator not in iterator list!"); } @@ -590,7 +591,7 @@ cc_int32 ccs_list_iterator_invalidate (ccs_list_iterator_t io_list_iterator) list_iterator->client_pipe = CCS_PIPE_NULL; } - err = ccs_list_iterator_release (io_list_iterator); + err = ccs_list_iterator_release (io_list_iterator); } return err; -- 2.26.2