libclamav: preserve callbacks during db reload (bb#2418)

ChangeLog

@@ -1,3 +1,7 @@
+Thu Dec  9 13:29:16 CET 2010 (tk)
+---------------------------------
+ * libclamav: preserve callbacks during db reload (bb#2418)
+
 Thu Dec  2 18:44:12 CET 2010 (tk)
 ---------------------------------
  * libclamav/matcher-ac.c: optimize handling of multi-part signatures (bb#2322)

libclamav/others.c

@@ -570,6 +570,13 @@ struct cl_settings *cl_engine_settings_copy(const struct cl_engine *engine)
     settings->min_ssn_count = engine->min_ssn_count;
     settings->pua_cats = engine->pua_cats ? strdup(engine->pua_cats) : NULL;
 
+    settings->cb_pre_scan = engine->cb_pre_scan;
+    settings->cb_post_scan = engine->cb_post_scan;
+    settings->cb_sigload = engine->cb_sigload;
+    settings->cb_sigload_ctx = engine->cb_sigload_ctx;
+    settings->cb_msg = engine->cb_msg;
+    settings->cb_hash = engine->cb_hash;
+
     return settings;
 }
 
@@ -606,6 +613,13 @@ int cl_engine_settings_apply(struct cl_engine *engine, const struct cl_settings
 	engine->pua_cats = NULL;
     }
 
+    engine->cb_pre_scan = settings->cb_pre_scan;
+    engine->cb_post_scan = settings->cb_post_scan;
+    engine->cb_sigload = settings->cb_sigload;
+    engine->cb_sigload_ctx = settings->cb_sigload_ctx;
+    engine->cb_msg = settings->cb_msg;
+    engine->cb_hash = settings->cb_hash;
+
     return CL_SUCCESS;
 }
 

libclamav/others.h

@@ -284,6 +284,14 @@ struct cl_settings {
     uint32_t min_cc_count;
     uint32_t min_ssn_count;
     char *pua_cats;
+
+    /* callbacks */
+    clcb_pre_scan cb_pre_scan;
+    clcb_post_scan cb_post_scan;
+    clcb_sigload cb_sigload;
+    void *cb_sigload_ctx;
+    clcb_msg cb_msg;
+    clcb_hash cb_hash;
 };
 
 extern int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);