@@ -279,6 +279,10 @@ void help(void)

     mprintf("    --max-ziptypercg=#n                  Maximum size zip to type reanalyze\n");

     mprintf("    --max-partitions=#n                  Maximum number of partitions in disk image to be scanned\n");

     mprintf("    --max-iconspe=#n                     Maximum number of icons in PE file to be scanned\n");

+    mprintf("    --enable-stats                       Enable statistical reporting of malware\n");

+    mprintf("    --disable-pe-stats                   Disable submission of individual PE sections in stats submissions\n");

+    mprintf("    --stats-timeout=#n                   Number of seconds to wait for waiting a response back from the stats server\n");

+    mprintf("    --stats-host-id=UUID                 Set the Host ID used when submitting statistical info.\n");

     mprintf("\n");

     mprintf("(*) Default scan settings\n");

     mprintf("(**) Certain files (e.g. documents, archives, etc.) may in turn contain other\n");

@@ -656,6 +656,26 @@ Default: 5M

 Disable authenticode certificate chain verification in PE files.

 .br

 Default: no

+.TP

+\fBStatsEnabled BOOL\fR

+Enable submission of statistical data

+.br

+Default: no

+.TP

+\fBStatsHostID STRING\fR

+HostID in the form of an UUID to use when submitting statistical information.

+.br

+Default: auto

+.TP

+\fBStatsPEDisabled BOOL\fR

+Disable submission of PE section statistical data.

+.br

+Default: no

+.TP

+\fBStatsTimeout NUMBER\fR

+Timeout in seconds to timeout communication with the stats server.

+.br

+Default: 10

 .SH "NOTES"

 .LP 

 All options expressing a size are limited to max 4GB. Values in excess will be resetted to the maximum.

@@ -213,6 +213,18 @@ This option sets the maximum number of partitions of a raw disk image to be scan

 .TP

 \fB\-\-max\-iconspe=#n\fR

 This option sets the maximum number of icons within a PE to be scanned. This must be a positive integer (default: 100).

+.TP

+\fB\-\-enable\-stats\fR

+This option enables submission of statistical data. (Default: stats submissions disabled)

+.TP

+\fB\-\-stats\-host\-id\fR

+This option sets the HostID, in the form of an UUID, to use when submitting statistical information.

+.TP

+\fB\-\-disable\-pe\-stats\fR

+This option disables the submission of PE section data. (Default: submitting of PE section data enabled if stats submissions as a whole is enabled).

+.TP

+\fB\-\-stats\-timeout=#n\fR

+This option sets the timeout in seconds to wait for communication back from the stats server. (Default: 10).

 .SH "EXAMPLES"

 .LP 

 .TP 

@@ -80,6 +80,12 @@ Upload detection statistics to the ClamAV Project (see freshclam.conf(5):SubmitD

 .TP

 \fB\-\-update\-db=DBNAME\fR

 With this option you can limit updates to a subset of database files. The DBNAME should be "main", "daily", "bytecode", "safebrowsing" or one of the 3rd party database names. This option can be used multiple times and only works with the official and 3rd party databases distrubuted through the ClamAV mirrors, your custom databases (specified with DatabaseCustomURL in freshclam.conf) will not be ignored.

+.TP

+\fB\-\-enable\-stats\fR

+Enable submission of statistical data.

+.TP

+\fB\-\-stats\-host\-id=UUID\fR

+HostID in the form of an UUID to use when submitting statistical information.

 .SH "EXAMPLES"

 .LP 

 .TP 

@@ -582,3 +582,23 @@ Example

 # 

 # Default: 5000

 # BytecodeTimeout 1000

+

+##

+## Statistics gathering and submitting

+##

+

+# Enable statistical reporting.

+# Default: no

+#StatsEnabled yes

+

+# Disable submission of individual PE sections for files flagged as malware.

+# Default: no

+#StatsPEDisabled yes

+

+# HostID in the form of an UUID to use when submitting statistical information.

+# Default: auto

+#StatsHostID auto

+

+# Time in seconds to wait for the stats server to come back with a response

+# Default: 10

+#StatsTimeout 10

@@ -198,7 +198,9 @@ help (void)

     mprintf

         ("    --list-mirrors                       print mirrors from mirrors.dat\n");

     mprintf

-        ("    --submit-stats[=/path/clamd.conf]    only submit detection statistics\n");

+        ("    --enable-stats                       enable statistical information reporting\n");

+    mprintf

+        ("    --stats-host-id=UUID                 HostID in the form of an UUID to use when submitting statistical information\n");

     mprintf

         ("    --update-db=DBNAME                   only update database DBNAME\n");