@@ -1,3 +1,7 @@

+Sat Aug  7 14:10:57 BST 2004 (njh)

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

+  * clamav-milter:	Better load balancing when max-children is not set

+

 Sat Aug  7 01:33:14 CEST 2004 (tk)

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

   * libclamav: matcher-bm: fix node sorting (false negative example provided

@@ -24,7 +28,7 @@ Thu Aug  5 11:41:00 CEST 2004 (tk)

 Thu Aug  5 08:44:51 BST 2004 (njh)

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

   * clamav-milter:	Handle more variants of gethostbyname_r

-  			Try harder to get fully qualified hostname

+			Try harder to get fully qualified hostname

 			Template files can now contain more than one variable

 			Template files sendmail variables handling changed to

 				allow access to variables not in braces. All

@@ -96,7 +100,7 @@ Mon Aug  2 12:28:31 CEST 2004 (tk)

 Sun Aug  1 09:21:50 BST 2004 (njh)

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

   * libclamav/blob.c:	Ensure attachments with pathnames are scanned under

-  				Cygwin

+				Cygwin

 Fri Jul 30 21:08:29 CEST 2004 (tk)

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

@@ -464,6 +464,7 @@ Changes

 0.75g	06/8/04	Handle privdata->from not set when --bounce is set

 			"Denis Ustimenko" <den@uzsci.net>

 		Quarantined file's names now contain the name of the virus

+0.75h	07/8/04	Some tweaking of the load balancing code

 BUG REPORTS

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

  *

  * Change History:

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

+ * Revision 1.116  2004/08/07 13:10:33  nigelhorne

+ * Better load balancing

+ *

  * Revision 1.115  2004/08/06 10:08:31  nigelhorne

  * Quarantined files now include the virus in the name

  *

@@ -356,9 +359,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.115 2004/08/06 10:08:31 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.116 2004/08/07 13:10:33 nigelhorne Exp $";

-#define	CM_VERSION	"0.75g"

+#define	CM_VERSION	"0.75h"

 /*#define	CONFDIR	"/usr/local/etc"*/

@@ -1397,7 +1400,12 @@ findServer(void)

 	if(max_children > 0)

 		j = n_children - 1;	/* Don't worry about no lock */

 	else

-		j = cli_rndnum(numServers) - 1;

+		/*

+		 * cli_rndnum returns 0..(max-1) - the max argument is not

+		 * the maximum number you want it to return, it is in fact

+		 * one *more* than the maximum number you want it to return

+		 */

+		j = cli_rndnum(numServers);

 	for(i = 0, server = servers; i < numServers; i++, server++) {

 		int sock;