@@ -434,8 +434,8 @@ int main(int argc, char **argv)

             logg("#Not loading PUA signatures.\n");

         }

-        if (optget(opts, "StatsDisabled")->enabled) {

-            cl_engine_set_clcb_stats_add_sample(engine, NULL);

+        if (optget(opts, "StatsEnabled")->enabled) {

+            cl_engine_stats_enable(engine);

         }

         if (optget(opts, "StatsPEDisabled")->enabled) {

@@ -582,8 +582,8 @@ int scanmanager(const struct optstruct *opts)

         cl_engine_set_num(engine, CL_ENGINE_DISABLE_PE_STATS, 1);

     }

-    if (optget(opts, "disable-stats")->enabled) {

-        cl_engine_set_clcb_stats_add_sample(engine, NULL);

+    if (optget(opts, "enable-stats")->enabled) {

+        cl_engine_stats_enable(engine);

     }

     if (optget(opts, "stats-timeout")->enabled) {

@@ -742,6 +742,9 @@ void submit_host_info(struct optstruct *opts)

     struct cl_engine *engine;

     cli_intel_t *intel;

+    if (!optget(opts, "enable-stats")->enabled)

+        return;

+

     engine = cl_engine_new();

     if (!(engine))

         return;

@@ -398,6 +398,8 @@ extern void cl_engine_set_clcb_stats_get_size(struct cl_engine *engine, clcb_sta

 typedef char * (*clcb_stats_get_hostid)(void *cbdata);

 extern void cl_engine_set_clcb_stats_get_hostid(struct cl_engine *engine, clcb_stats_get_hostid callback);

+extern void cl_engine_stats_enable(struct cl_engine *engine);

+

 struct cl_stat {

     char *dir;

     STATBUF *stattab;

@@ -55,6 +55,7 @@ CLAMAV_PUBLIC {

     cl_update_hash;

     cl_finish_hash;

     cl_hash_destroy;

+    cl_engine_stats_enable;

 };

 CLAMAV_PRIVATE {

   global:

@@ -672,3 +672,9 @@ void cl_engine_set_clcb_stats_get_hostid(struct cl_engine *engine, clcb_stats_ge

 {

     engine->cb_stats_get_hostid = callback;

 }

+

+void cl_engine_stats_enable(struct cl_engine *engine)

+{

+    engine->cb_stats_add_sample = clamav_stats_add_sample;

+    engine->cb_stats_submit = clamav_stats_submit;

+}

@@ -186,7 +186,7 @@ const struct clam_option __clam_options[] = {

     { "StatsHostID", "stats-host-id", 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_CLAMD | OPT_CLAMSCAN, "HostID in the form of an UUID to use when submitting statistical information. See the clamscan manpage for more information.", "default" },

-    { "StatsDisabled", "disable-stats", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN, "Disable submission of statistical data", "no" },

+    { "StatsEnabled", "enable-stats", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN, "Enable submission of statistical data", "yes" },

     { "StatsPEDisabled", "disable-pe-stats", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Disable submission of PE section statistical data", "no" },

@@ -74,6 +74,7 @@ EXPORTS cl_hash_init @66

 EXPORTS cl_update_hash @67

 EXPORTS cl_finish_hash @68

 EXPORTS cl_hash_destroy @69

+EXPORTS cl_engine_stats_enable @70

 ; path variables

 ; --------------