@@ -1,3 +1,7 @@

+Wed Jun 29 03:05:45 CEST 2005 (tk)

+----------------------------------

+  * libclamav: fix rar-sfx detection

+

 Mon Jun 27 22:01:55 BST 2005 (njh)

 ----------------------------------

   * clamav-milter:	Changed the default child_timeout to 5 minutes

@@ -46,9 +46,9 @@ typedef enum {

     CL_TYPE_PDF,

     /* bigger numbers have higher priority (in o-t-f detection) */

-    CL_TYPE_RARSFX,

     CL_TYPE_HTML, /* on the fly */

-    CL_TYPE_MAIL  /* magic + on the fly */

+    CL_TYPE_MAIL,  /* magic + on the fly */

+    CL_TYPE_RARSFX /* on the fly */

 } cli_file_t;

@@ -1566,19 +1566,19 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

 	    nret == CL_TYPE_MAIL ? mrec++ : arec++;

 	    switch(nret) {

 		case CL_TYPE_HTML:

-		    if(SCAN_HTML)

+		    if(SCAN_HTML && type == CL_TYPE_UNKNOWN_TEXT)

 			if(cli_scanhtml(desc, virname, scanned, root, limits, options, arec, mrec) == CL_VIRUS)

 			    return CL_VIRUS;

 		    break;

 		case CL_TYPE_MAIL:

-		    if(SCAN_MAIL)

+		    if(SCAN_MAIL && type == CL_TYPE_UNKNOWN_TEXT)

 			if(cli_scanmail(desc, virname, scanned, root, limits, options, arec, mrec) == CL_VIRUS)

 			    return CL_VIRUS;

 		    break;

 		case CL_TYPE_RARSFX:

-		    if(SCAN_ARCHIVE)

+		    if(SCAN_ARCHIVE && type == CL_TYPE_MSEXE)

 			cli_dbgmsg("RAR-SFX found at %d\n", ftoffset);

 		    break;

 	    }