activate archive scanning option

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b648647c700a008b3b2454120a59ef97dd28ad6c..b3913387a4d80948c8d8febad2d86932ffdf0fe0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-04-12 [paul]      0.8.11claws87
+
+       * src/plugins/clamav/clamav_plugin.c
+               activate enable/disable archive scanning option
+               
+       * src/plugins/clamav/.cvsignore         ** NEW FILE **
+
 2003-04-12 [paul]      0.8.11claws86
 
        * src/plugins/Makefile.am

diff --git a/configure.ac b/configure.ac
index 4c0c35988f90aeb3a75cd8e2edc0758c02cbc46f..a3de32d0f5248e20e9b0ebf0d3150ecd83d2b396 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws86
+EXTRA_VERSION=claws87
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index 5b999aa8fcc7be09ef95ae8c54fd1536721b2f48..0d729b8dca785479193f1e9a6347e9476c90a6e0 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -81,6 +81,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        MimeInfo *child;
        gchar *infile;
        gchar *outfile;
+       gint scan_archive = 0;
 
        int ret, no;
        unsigned long int size;
@@ -127,6 +128,9 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        limits.maxfilesize = config.clamav_max_size * 1048576; /* maximal archived file size == 10 Mb */
        limits.maxreclevel = 8; /* maximal recursion level */
 
+       if (config.clamav_archive_enable)
+               scan_archive = TRUE;
+
        while (child != NULL) {
                if (child->children || child->mime_type == MIME_MULTIPART) {
                        child = procmime_mimeinfo_next(child);
@@ -144,9 +148,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                        g_warning("Can't get the part of multipart message.");
                else {
                        debug_print("Scanning %s\n", outfile);
-
                        if((ret = cl_scanfile(outfile, &virname, &size, root, 
-                                             &limits, CL_ARCHIVE)) == CL_VIRUS) {
+                                             &limits, scan_archive)) == CL_VIRUS) {
                                is_infected = TRUE;
                                debug_print("Detected %s virus.\n", virname); 
                        } else {