@@ -1,3 +1,10 @@

+Sun Dec 19 17:01:56 GMT 2004 (njh)

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

+  * clamav-milter: Correctly warn that --max_childen must be given in SESSION

+		mode if LocalSocket is used and MaxThreads isn't given in

+		clamd.conf. max_children is needed to know how many sessions

+		to initiate to clamd(s)

+

 Sun Dec 19 13:51:20 GMT 2004 (njh)

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

   * libclamav/mbox.c:	Further work on the non-parsing version.

@@ -618,6 +618,8 @@ Changes

 0.80cc	13/12/04:	Fix crash on FreeBSD if DNS has been incorrectly set up

 		Mutex the version strings

 0.80dd	19/12/04:	Tidy up non SESSION code

+0.80ee	19/12/04:	Error didn't appear in SESSIONS mode if LocalSocket set

+		and neither max-children nor MaxThreads is set.

 INTERNATIONALISATION

@@ -26,6 +26,9 @@

  *

  * Change History:

  * $Log: clamav-milter.c,v $

+ * Revision 1.165  2004/12/19 17:00:28  nigelhorne

+ * Ensure --max-children > 0 in LocalSocket mode with SESSIONS

+ *

  * Revision 1.164  2004/12/19 13:49:28  nigelhorne

  * Fix non SESSION compilation error

  *

@@ -503,9 +506,9 @@

  * Revision 1.6  2003/09/28 16:37:23  nigelhorne

  * Added -f flag use MaxThreads if --max-children not set

  */

-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.164 2004/12/19 13:49:28 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.165 2004/12/19 17:00:28 nigelhorne Exp $";

-#define	CM_VERSION	"0.80dd"

+#define	CM_VERSION	"0.80ee"

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -1634,6 +1637,14 @@ main(int argc, char **argv)

 			clamav_version = strdup(version);

 		}

 	} else {

+		/*

+		 * We need to know how many connections to establish to clamd

+		 */

+		if(max_children == 0) {

+			fprintf(stderr, _("%s: --max-children must be given in sessions mode\n"), argv[0]);

+			return EX_CONFIG;

+		}

+

 		clamav_versions = (char **)cli_malloc(max_children * sizeof(char *));

 		if(clamav_versions == NULL)

 			return EX_TEMPFAIL;