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

+Fri Aug 25 14:11:05 BST 2006 (njh)

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

+  * clamav-milter:	Fix a problem with multiple messages on the same

+				connexion introduced earlier today

+

 Fri Aug 25 11:22:24 BST 2006 (njh)

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

   * clamav-milter:	Start a separate thread for each load balancing server

@@ -23,7 +23,7 @@

  *

  * For installation instructions see the file INSTALL that came with this file

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.281 2006/08/25 10:21:54 njh Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.282 2006/08/25 13:09:58 njh Exp $";

 #define	CM_VERSION	"devel-250806"

@@ -2514,6 +2514,12 @@ clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)

 	if(privdata == NULL)

 		return cl_error;

+#ifdef	SESSION

+	privdata->dataSocket = -1;

+#else

+	privdata->dataSocket = privdata->cmdSocket = -1;

+#endif

+

 	if(smfi_setpriv(ctx, privdata) == MI_SUCCESS) {

 		strcpy(privdata->ip, remoteIP);

 		return SMFIS_CONTINUE;

@@ -2560,10 +2566,17 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 	if(privdata == NULL) {

 		/* More than one message on this connection */

+		/* FIXME: if the last one sent a virus we should blacklist */

 		privdata = (struct privdata *)cli_calloc(1, sizeof(struct privdata));

 		if(privdata == NULL)

 			return cl_error;

+#ifdef	SESSION

+		privdata->dataSocket = -1;

+#else

+		privdata->dataSocket = privdata->cmdSocket = -1;

+#endif

+

 		if(smfi_setpriv(ctx, privdata) != MI_SUCCESS) {

 			free(privdata);

 			return cl_error;

@@ -2653,11 +2666,6 @@ clamfi_envfrom(SMFICTX *ctx, char **argv)

 		}

 	}

-	privdata->dataSocket = -1;	/* 0.4 */

-#ifndef	SESSION

-	privdata->cmdSocket = -1;	/* 0.4 */

-#endif

-

 	/*

 	 * Rejection is via 550 until DATA is received. We know that

 	 * DATA has been sent when either we get a header or the end of

@@ -3903,11 +3911,11 @@ clamfi_send(struct privdata *privdata, size_t len, const char *format, ...)

 #ifdef HAVE_STRERROR_R

 					char buf[32];

 					strerror_r(errno, buf, sizeof(buf));

-					syslog(LOG_ERR,

-						_("write failure (%u bytes) to clamd: %s"),

+					logg(_("!write failure (%u bytes) to clamd: %s\n"),

 						len, buf);

 #else

-					syslog(LOG_ERR, _("write failure (%u bytes) to clamd: %s"), len, strerror(errno));

+					logg(_("!write failure (%u bytes) to clamd: %s\n"),

+						len, strerror(errno));

 #endif

 				}

 				checkClamd();