Don't print spurious errors to debug logs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20508 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c
index b35081feb5f03b3d6baeba699f469457f1b1132a..c2e36bf0beb878ffeb2b4ba04adfda4f5b262791 100644 (file)
--- 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 0066f36fd8f9349c2cc925a8fb4c019cba615044..07e5ee8d195cdc298bcba3c4b851b564563d76fc 100644 (file)
--- 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;