@@ -1,3 +1,8 @@

+Thu Jun  2 20:04:04 CEST 2005 (tk)

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

+  * libclamav: remove support for CL_SCAN_DISABLERAR (RAR unpacker is now

+	       enabled with CL_SCAN_ARCHIVE)

+

 Thu Jun  2 08:56:39 BST 2005 (njh)

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

   * libclamav/pdf.c:	Handle ascii85encoded streams that are full of z's.

@@ -19,7 +24,11 @@ Wed Jun  1 02:39:14 CEST 2005 (tk)

 			- default values are directly associated with options

   * clamd/defaults.h: remove

   * clamd, clamdscan, freshclam: use new parser scheme

-  * etc/clamd.conf: remove DisableDefaultScanOptions

+  * etc/clamd.conf: - remove DisableDefaultScanOptions (scan options can be

+		      now configured individually)

+		    - remove ScanRAR (RAR unpacker is now enabled with

+		      ScanArchive)

+

 Tue May 31 19:15:01 BST 2005 (njh)

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

@@ -67,14 +67,13 @@ extern "C"

 #define CL_SCAN_RAW		0

 #define CL_SCAN_ARCHIVE		1

 #define CL_SCAN_MAIL		2

-#define CL_SCAN_DISABLERAR	4

-#define CL_SCAN_OLE2		8

-#define CL_SCAN_BLOCKENCRYPTED	16

-#define CL_SCAN_HTML		32

-#define CL_SCAN_PE		64

-#define CL_SCAN_BLOCKBROKEN	128

-#define CL_SCAN_MAILURL		256

-#define CL_SCAN_BLOCKMAX	512

+#define CL_SCAN_OLE2		4

+#define CL_SCAN_BLOCKENCRYPTED	8

+#define CL_SCAN_HTML		16

+#define CL_SCAN_PE		32

+#define CL_SCAN_BLOCKBROKEN	64

+#define CL_SCAN_MAILURL		128

+#define CL_SCAN_BLOCKMAX	256

 /* recommended options */

 #define CL_SCAN_STDOPT		(CL_SCAN_ARCHIVE | CL_SCAN_MAIL | CL_SCAN_OLE2 | CL_SCAN_HTML | CL_SCAN_PE) 

@@ -83,7 +82,6 @@ extern "C"

 #define CL_RAW		CL_SCAN_RAW

 #define CL_ARCHIVE	CL_SCAN_ARCHIVE

 #define CL_MAIL		CL_SCAN_MAIL

-#define CL_DISABLERAR	CL_SCAN_DISABLERAR

 #define CL_OLE2		CL_SCAN_OLE2

 #define CL_ENCRYPTED    CL_SCAN_BLOCKENCRYPTED

@@ -96,7 +96,6 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *

 #define SCAN_OLE2	    (options & CL_SCAN_OLE2)

 #define SCAN_HTML	    (options & CL_SCAN_HTML)

 #define SCAN_PE		    (options & CL_SCAN_PE)

-#define DISABLE_RAR	    (options & CL_SCAN_DISABLERAR)

 #define DETECT_ENCRYPTED    (options & CL_SCAN_BLOCKENCRYPTED)

 #define BLOCKMAX	    (options & CL_SCAN_BLOCKMAX)

@@ -1431,7 +1430,7 @@ int cli_magic_scandesc(int desc, const char **virname, long int *scanned, const

     switch(type) {

 	case CL_TYPE_RAR:

-	    if(!DISABLE_RAR && SCAN_ARCHIVE)

+	    if(SCAN_ARCHIVE)

 		ret = cli_scanrar(desc, virname, scanned, root, limits, options, arec, mrec);

 	    break;