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

+Sun Jan  7 21:48:22 CET 2007 (tk)

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

+  * libclamav: enable RTF extractor by default

+

 Sun Jan  7 21:38:01 CET 2007 (tk)

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

   * libclamav: avoid unicode name collisions when scanning OLE2 containers,

@@ -128,10 +128,8 @@ static const struct cli_magic_s cli_magic[] = {

     {0,  "\320\317\021\340\241\261\032\341", 8, "OLE2 container", CL_TYPE_MSOLE2},

     {0,  "\%PDF-",			 5, "PDF document", CL_TYPE_PDF},

     {0,  "\266\271\254\256\376\377\377\377", 8, "CryptFF", CL_TYPE_CRYPTFF},

-

-#ifdef CL_EXPERIMENTAL  

     {0,  "{\\rtf",                           5, "RTF", CL_TYPE_RTF}, 

-#endif    

+

     /* Ignored types */

     {0,  "\000\000\001\263",             4, "MPEG video stream",  CL_TYPE_DATA},

@@ -54,9 +54,8 @@ typedef enum {

     CL_TYPE_UUENCODED,

     CL_TYPE_PST,	/* Microsoft Outlook binary email folder (.pst file) */

     CL_TYPE_HTML_UTF16,

-#ifdef CL_EXPERIMENTAL

     CL_TYPE_RTF,

-#endif

+

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

     CL_TYPE_HTML, /* on the fly */

     CL_TYPE_MAIL,  /* magic + on the fly */

@@ -21,8 +21,6 @@

 #include "clamav-config.h"

 #endif

-#ifdef CL_EXPERIMENTAL

-

 #include <stdio.h>

 #include <string.h>

 #include <sys/types.h>

@@ -665,5 +663,3 @@ int cli_scanrtf(int desc, cli_ctx *ctx)

 	SCAN_CLEANUP;

 	return ret;

 }

-

-#endif

@@ -1,11 +1,27 @@

+/*

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License as published by

+ *  the Free Software Foundation; either version 2 of the License, or

+ *  (at your option) any later version.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ */

+

 #ifndef _RTF_H

 #define _RTF_H

-#include <clamav-config.h>

-#ifdef CL_EXPERIMENTAL

+#include "others.h"

 int cli_scanrtf(int desc, cli_ctx *ctx);

 #endif

-

-#endif

@@ -79,10 +79,7 @@ extern short cli_leavetemps_flag;

 #include "str.h"

 #include "mspack.h"

 #include "cab.h"

-

-#ifdef CL_EXPERIMENTAL

 #include "rtf.h"

-#endif

 #ifdef HAVE_ZLIB_H

 #include <zlib.h>

@@ -1772,11 +1769,9 @@ int cli_magic_scandesc(int desc, cli_ctx *ctx)

 		ret = cli_scanhtml_utf16(desc, ctx);

 	    break;

-#ifdef CL_EXPERIMENTAL

 	case CL_TYPE_RTF:

 	    ret = cli_scanrtf(desc, ctx);

 	    break;

-#endif

 	case CL_TYPE_MAIL:

 	    if(SCAN_MAIL)