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

+Tue Sep 16 19:34:56 CEST 2003 (tk)

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

+  * libclamav: scan messages that start with "Delivered-To"

+

 Tue Sep 16 18:47:39 CEST 2003 (tk)

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

   * clamd: fixed compilation error (missing sighup variable)

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

 #define MAIL_MAGIC_STR "From "

 #define RAWMAIL_MAGIC_STR "Received: "

 #define MAILDIR_MAGIC_STR "Return-Path: "

+#define DELIVERED_MAGIC_STR "Delivered-To: "

 #define BZIP_MAGIC_STR "BZh"

@@ -650,6 +651,9 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct

 	} else if(!strncmp(magic, MAILDIR_MAGIC_STR, strlen(MAILDIR_MAGIC_STR))) {

 	    cli_dbgmsg("Recognized Maildir mail file.\n");

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

+	} else if(!strncmp(magic, DELIVERED_MAGIC_STR, strlen(DELIVERED_MAGIC_STR))) {

+	    cli_dbgmsg("Recognized (Delivered-To) mail file.\n");

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

 	}

 	(*reclev)--;

     }