enable ScanPDF by default (bb#1179)

git-svn: trunk@4189
17 years ago · e863785852
parent e791981b01
commit e863785852
5 changed files with 9 additions and 4 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Thu Sep 18 11:52:11 CEST 2008 (tk)
+----------------------------------
+  * clamd: enable ScanPDF by default (bb#1179)
+  * libclamav/clamav.h: add CL_SCAN_PDF to CL_SCAN_STDOPT
+
 Thu Sep 18 10:25:07 CEST 2008 (tk)
 ----------------------------------
  * clamdscan: add support for --reload (bb#1098)
--- a/docs/man/clamd.conf.5.in
+++ b/docs/man/clamd.conf.5.in
@ -238,7 +238,7 @@ Default: yes
 \fBScanPDF BOOL\fR
 This option enables scanning within PDF files.
 .br 
-Default: no
+Default: yes
 .TP 
 \fBScanHTML BOOL\fR
 Enables HTML detection and normalisation.
--- a/etc/clamd.conf
+++ b/etc/clamd.conf
@ -226,7 +226,7 @@ LocalSocket /tmp/clamd.socket
 #ScanOLE2 yes

 # This option enables scanning within PDF files.
-# Default: no
+# Default: yes
 #ScanPDF yes


--- a/libclamav/clamav.h
+++ b/libclamav/clamav.h
@ -102,7 +102,7 @@ extern "C"
 #define CL_SCAN_HEURISTIC_PRECEDENCE    0x80000

 /* recommended scan settings */
-#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF)
+#define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_PDF | CL_SCAN_HTML | CL_SCAN_PE | CL_SCAN_ALGORITHMIC | CL_SCAN_ELF)

 /* aliases for backward compatibility */
 #define CL_RAW		CL_SCAN_RAW
--- a/shared/cfgparser.c
+++ b/shared/cfgparser.c
@ -66,7 +66,7 @@ struct cfgoption cfg_options[] = {
    {"AlgorithmicDetection", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
    {"ScanHTML", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
    {"ScanOLE2", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
-    {"ScanPDF", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},
+    {"ScanPDF", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
    {"ScanArchive", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
    {"MaxScanSize", OPT_COMPSIZE, 104857600, NULL, 0, OPT_CLAMD},
    {"MaxFileSize", OPT_COMPSIZE, 26214400, NULL, 0, OPT_CLAMD},