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

+Wed Sep 24 18:35:29 CEST 2003 (tk)

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

+  * libclamav: disabled support for news messages

+

 Wed Sep 24 10:37:10 BST 2003 (njh)

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

@@ -55,7 +55,6 @@ int cli_scanrar_inuse = 0;

 #define ZIP_MAGIC_STR "PK\003\004"

 #define GZIP_MAGIC_STR "\037\213"

 #define MAIL_MAGIC_STR "From "

-#define NEWS_MAGIC_STR "Path:"

 #define RAWMAIL_MAGIC_STR "Received: "

 #define MAILDIR_MAGIC_STR "Return-Path: "

 #define DELIVERED_MAGIC_STR "Delivered-To: "

@@ -644,9 +643,7 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct

 	    ret = cli_scanbzip(desc, virname, scanned, root, limits, options, reclev);

 	}

 #endif

-	else if(SCAN_MAIL &&

-		(!strncmp(magic, MAIL_MAGIC_STR, strlen(MAIL_MAGIC_STR)) ||

-		 !strncmp(magic, NEWS_MAGIC_STR, strlen(NEWS_MAGIC_STR)))) {

+	else if(SCAN_MAIL && !strncmp(magic, MAIL_MAGIC_STR, strlen(MAIL_MAGIC_STR))) {

 	    ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);

 	}

 	else if(SCAN_MAIL && !strncmp(magic, RAWMAIL_MAGIC_STR, strlen(RAWMAIL_MAGIC_STR))) {