Browse code

enable ScanPDF by default (bb#1179)

git-svn: trunk@4189

Tomasz Kojm authored on 2008/09/18 18:45:47
Showing 5 changed files
... ...
@@ -1,3 +1,8 @@
1
+Thu Sep 18 11:52:11 CEST 2008 (tk)
2
+----------------------------------
3
+  * clamd: enable ScanPDF by default (bb#1179)
4
+  * libclamav/clamav.h: add CL_SCAN_PDF to CL_SCAN_STDOPT
5
+
1 6
 Thu Sep 18 10:25:07 CEST 2008 (tk)
2 7
 ----------------------------------
3 8
   * clamdscan: add support for --reload (bb#1098)
... ...
@@ -238,7 +238,7 @@ Default: yes
238 238
 \fBScanPDF BOOL\fR
239 239
 This option enables scanning within PDF files.
240 240
 .br 
241
-Default: no
241
+Default: yes
242 242
 .TP 
243 243
 \fBScanHTML BOOL\fR
244 244
 Enables HTML detection and normalisation.
... ...
@@ -226,7 +226,7 @@ LocalSocket /tmp/clamd.socket
226 226
 #ScanOLE2 yes
227 227
 
228 228
 # This option enables scanning within PDF files.
229
-# Default: no
229
+# Default: yes
230 230
 #ScanPDF yes
231 231
 
232 232
 
... ...
@@ -102,7 +102,7 @@ extern "C"
102 102
 #define CL_SCAN_HEURISTIC_PRECEDENCE    0x80000
103 103
 
104 104
 /* recommended scan settings */
105
-#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)
105
+#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)
106 106
 
107 107
 /* aliases for backward compatibility */
108 108
 #define CL_RAW		CL_SCAN_RAW
... ...
@@ -66,7 +66,7 @@ struct cfgoption cfg_options[] = {
66 66
     {"AlgorithmicDetection", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
67 67
     {"ScanHTML", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
68 68
     {"ScanOLE2", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
69
-    {"ScanPDF", OPT_BOOL, 0, NULL, 0, OPT_CLAMD},
69
+    {"ScanPDF", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
70 70
     {"ScanArchive", OPT_BOOL, 1, NULL, 0, OPT_CLAMD},
71 71
     {"MaxScanSize", OPT_COMPSIZE, 104857600, NULL, 0, OPT_CLAMD},
72 72
     {"MaxFileSize", OPT_COMPSIZE, 26214400, NULL, 0, OPT_CLAMD},