@@ -267,6 +267,7 @@ void help(void)

     mprintf("    --scan-archive[=yes(*)/no]           Scan archive files (supported by libclamav)\n");

     mprintf("    --detect-broken[=yes/no(*)]          Try to detect broken executable files\n");

     mprintf("    --block-encrypted[=yes/no(*)]        Block encrypted archives\n");

+    mprintf("    --block-macros[=yes/no(*)]           Block OLE2 files with VBA macros\n");

     mprintf("    --nocerts                            Disable authenticode certificate chain verification in PE files\n");

     mprintf("    --dumpcerts                          Dump authenticode certificate chain in PE files\n");

     mprintf("\n");

@@ -1056,6 +1056,9 @@ int scanmanager(const struct optstruct *opts)

     if(optget(opts, "block-encrypted")->enabled)

         options |= CL_SCAN_BLOCKENCRYPTED;

+    if(optget(opts, "block-macros")->enabled)

+        options |= CL_SCAN_BLOCKMACROS;

+

     if(optget(opts, "scan-pe")->enabled)

         options |= CL_SCAN_PE;

@@ -183,6 +183,9 @@ Mark broken executables as viruses (Broken.Executable).

 \fB\-\-block\-encrypted[=yes/no(*)]\fR

 Mark encrypted archives as viruses (Encrypted.Zip, Encrypted.RAR).

 .TP 

+\fB\-\-block\-macros[=yes/no(*)]\fR

+Mark OLE2 files containing VBA macros as viruses (Heuristics.OLE2.ContainsMacros).

+.TP 

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

 Extract and scan at most #n bytes from each archive. You may pass the value in kilobytes in format xK or xk, or megabytes in format xM or xm, where x is a number. This option protects your system against DoS attacks (default: 25 MB, max: <4 GB)

 .TP 

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

     { "ScanOLE2", "scan-ole2", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "This option enables scanning of OLE2 files, such as Microsoft Office\ndocuments and .msi files.\nIf you turn off this option, the original files will still be scanned, but\nwithout additional processing.", "yes" },

-    { "OLE2BlockMacros", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "With this option enabled OLE2 files with VBA macros, which were not\ndetected by signatures will be marked as \"Heuristics.OLE2.ContainsMacros\".", "no" },

+    { "OLE2BlockMacros", "block-macros", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "With this option enabled OLE2 files with VBA macros, which were not\ndetected by signatures will be marked as \"Heuristics.OLE2.ContainsMacros\".", "no" },

     { "ScanPDF", "scan-pdf", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "This option enables scanning within PDF files.\nIf you turn off this option, the original files will still be scanned, but\nwithout decoding and additional processing.", "yes" },