@@ -1,3 +1,11 @@

+Wed Feb 18 10:12:54 GMT 2004 (njh)

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

+  * libclamav:	Found some occurances of Yaha

+	Added debug of number of lines in (encoded) attachment

+  * clamav-milter:	clamav-milter now builds on freeBSD 5.2 (wrong logic

+  		in including malloc.h)

+	clamav-milter no longer allows --force to override TCPwrappers

+

 Wed Feb 18 04:09:56 CET 2004 (tk)

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

   * clamd: temporarily disabled strerror_r (due to a compilation problem on

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: mbox.c,v $

+ * Revision 1.45  2004/02/18 10:07:40  nigelhorne

+ * Find some Yaha

+ *

  * Revision 1.44  2004/02/15 08:45:54  nigelhorne

  * Avoid scanning the same file twice

  *

@@ -123,7 +126,7 @@

  * Compilable under SCO; removed duplicate code with message.c

  *

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.44 2004/02/15 08:45:54 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.45 2004/02/18 10:07:40 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -644,6 +647,8 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 			 * some duplication of code to be cleaned up

 			 */

 			for(multiparts = 0; t_line && (multiparts < MAXALTERNATIVE); multiparts++) {

+				int lines = 0;

+

 				aMessage = messages[multiparts] = messageCreate();

 				cli_dbgmsg("Now read in part %d\n", multiparts);

@@ -741,11 +746,16 @@ parseEmailBody(message *messageIn, blob **blobsIn, int nBlobs, text *textIn, con

 						 */

 						/* t_line = NULL;*/

 						break;

-					} else

+					} else {

 						messageAddLine(aMessage, line);

+						lines++;

+					}

 				} while((t_line = t_line->t_next) != NULL);

 				messageClean(aMessage);

+

+				cli_dbgmsg("Part %d has %d lines\n",

+					multiparts, lines);

 			}

 			free((char *)boundary);

@@ -17,6 +17,9 @@

  *

  * Change History:

  * $Log: message.c,v $

+ * Revision 1.33  2004/02/18 10:07:40  nigelhorne

+ * Find some Yaha

+ *

  * Revision 1.32  2004/02/17 20:43:50  nigelhorne

  * Added bounce message

  *

@@ -93,7 +96,7 @@

  * uuencodebegin() no longer static

  *

  */

-static	char	const	rcsid[] = "$Id: message.c,v 1.32 2004/02/17 20:43:50 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: message.c,v 1.33 2004/02/18 10:07:40 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -980,9 +983,9 @@ messageToBlob(const message *m)

 			 * annoyingly then put plain text after the '='

 			 * bytes. Sigh

 			 */

-			if(messageGetEncoding(m) == BASE64)

+			/*if(messageGetEncoding(m) == BASE64)

 				if(strchr(line, '='))

-					break;

+					break;*/

 		} while((t_line = t_line->t_next) != NULL);

 	return b;