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

+Fri Mar 27 13:19:05 CET 2009 (acab)

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

+ * clamav-milter/clamfi.c: Make sure connect/gentemp is called even

+			   if the message has not got headers (bb#1499)

+

 Tue Mar 24 19:41:25 CET 2009 (tk)

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

  * configure: don't define HAVE_ZLIB_H

@@ -116,6 +116,12 @@ static sfsistat sendchunk(struct CLAMFI *cf, unsigned char *bodyp, size_t len, S

     if(cf->totsz >= maxfilesize)

 	return SMFIS_CONTINUE;

+    if(!cf->totsz && nc_connect_rand(&cf->main, &cf->alt, &cf->local)) {

+	logg("!Failed to initiate streaming/fdpassing\n");

+	nullify(ctx, cf, CF_NONE);

+	return FailAction;

+    }

+

     if(cf->totsz + len > maxfilesize)

 	len = maxfilesize - cf->totsz;

@@ -181,11 +187,6 @@ sfsistat clamfi_header(SMFICTX *ctx, char *headerf, char *headerv) {

 	    nullify(ctx, cf, CF_NONE);

 	    return SMFIS_ACCEPT;

 	}

-	if(nc_connect_rand(&cf->main, &cf->alt, &cf->local)) {

-	    logg("!Failed to initiate streaming/fdpassing\n");

-	    nullify(ctx, cf, CF_NONE);

-	    return FailAction;

-	}

 	if((ret = sendchunk(cf, (unsigned char *)"From clamav-milter\n", 19, ctx)) != SMFIS_CONTINUE)

 	    return ret;

     }