bb#2321

ChangeLog

@@ -1,3 +1,7 @@
+Sat Oct 16 18:23:17 CEST 2010 (acab)
+------------------------------------
+ * clamav-milter: send FILDES early (bb#2321)
+
 Fri Oct 15 17:48:00 CEST 2010 (acab)
 ------------------------------------
  * libclamav/pe_icons.c: make sure all ref points are initted (bb#2291)

clamav-milter/clamfi.c

@@ -284,12 +284,6 @@ sfsistat clamfi_eom(SMFICTX *ctx) {
     }
 
     if(cf->local) {
-	if(nc_send(cf->main, "nFILDES\n", 8)) {
-	    logg("!FD scan request failed\n");
-	    nullify(ctx, cf, CF_ALT);
-	    return FailAction;
-	}
-
 	lseek(cf->alt, 0, SEEK_SET);
 
 	if(nc_sendmsg(cf->main, cf->alt) == -1) {

clamav-milter/netcode.c

@@ -320,6 +320,12 @@ int nc_connect_rand(int *main, int *alt, int *local) {
 	}
 	unlink(unlinkme);
 	free(unlinkme);
+	if(nc_send(*main, "nFILDES\n", 8)) {
+	    logg("!FD scan request failed\n");
+	    close(*alt);
+	    close(*main);
+	    return 1;
+	}
     } else {
 	if(nc_send(*main, "nINSTREAM\n", 10)) {
 	    logg("!Failed to communicate with clamd\n");