Merge branch 'master' of ssh+git://git.clam.sourcefire.com/var/lib/git/clamav-devel

win32/clamav-for-windows/clamav-for-windows/clscanapi.h

@@ -333,6 +333,12 @@ CLAMAPI const wchar_t * Scan_GetErrorMsg(int errorCode);
  */
 CLAMAPI void Scan_ReloadDatabase(BOOL bLoadMinDefs);
 
+/*
+ * Flush internal whitelist cache
+ * Returns TRUE on success and FALSE on failure to re-initialize cache
+ */
+CLAMAPI BOOL Scan_FlushCache();
+
 #ifdef __cplusplus
 }; /* extern "C" */
 #endif

win32/clamav-for-windows/clamav-for-windows/interface.c

@@ -27,6 +27,7 @@
 #include "mpool.h"
 #include "clscanapi.h"
 #include "interface.h"
+#include "cache.h"
 
 const char *types[] = {
     "<<rsvd>>",		/*  0 */
@@ -1087,6 +1088,13 @@ int CLAMAPI Scan_DeleteScanInfo(CClamAVScanner *pScanner, PCLAM_SCAN_INFO_LIST p
     WIN();
 }
 
+CLAMAPI BOOL Scan_FlushCache()
+{
+	cli_cache_destroy(engine);
+	if (cli_cache_init(engine)) 
+		return FALSE;
+	return TRUE;
+}
 
 static void ftype_bits(const char *type, _int64 *filetype) {
     int i;

win32/libclamav.def

@@ -219,3 +219,5 @@ EXPORTS w32_inet_ntoa @44347 NONAME
 EXPORTS w32_getpeername @44348 NONAME
 EXPORTS cli_sigperf_print @44349 NONAME
 EXPORTS cli_sigperf_events_destroy @44350 NONAME
+EXPORTS cli_cache_init @44351 NONAME
+EXPORTS cli_cache_destroy @44352 NONAME