Use random_number rather than random, for external server distribution. Bug 2694

diff --git a/src/src/spam.c b/src/src/spam.c
index b0e24b3682095d7f1009334553570dff6ca5d09e..286038678dca58250d70cfb0367030b07766a338 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -139,21 +139,11 @@ unsigned int i;
 spamd_address_container * sd;
 long weights;
 unsigned pri;
 spamd_address_container * sd;
 long weights;
 unsigned pri;

-static BOOL srandomed = FALSE;

 
 /* speedup, if we have only 1 server */
 if (num_servers == 1)
   return (spamds[0]->is_failed ? -1 : 0);
 
 
 /* speedup, if we have only 1 server */
 if (num_servers == 1)
   return (spamds[0]->is_failed ? -1 : 0);
 

-/* init ranmod */
-if (!srandomed)
-  {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  srandom((unsigned int)(tv.tv_usec/1000));
-  srandomed = TRUE;
-  }
-

 /* scan for highest pri */
 for (pri = 0, i = 0; i < num_servers; i++)
   {
 /* scan for highest pri */
 for (pri = 0, i = 0; i < num_servers; i++)
   {


@@ -170,7 +160,7 @@ for (weights = 0, i = 0; i < num_servers; i++)
 if (weights == 0)      /* all servers failed */
   return -1;
 
 if (weights == 0)      /* all servers failed */
   return -1;
 

-for (long rnd = random() % weights, i = 0; i < num_servers; i++)
+for (long rnd = random_number(weights), i = 0; i < num_servers; i++)

   {
   sd = spamds[i];
   if (!sd->is_failed && sd->priority == pri)
   {
   sd = spamds[i];
   if (!sd->is_failed && sd->priority == pri)

diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
index cd8ed3e6d990f47e53b06c35e1666d8623621086..22cfbecb4379c544a9935e5efd2d64bd46f6026a 100644 (file)
--- a/src/src/transports/smtp_socks.c
+++ b/src/src/transports/smtp_socks.c
@@ -160,20 +160,10 @@ socks_opts * sd;
 socks_opts * lim = &proxies[nproxies];
 long rnd, weights;
 unsigned pri;
 socks_opts * lim = &proxies[nproxies];
 long rnd, weights;
 unsigned pri;

-static BOOL srandomed = FALSE;

 
 if (nproxies == 1)             /* shortcut, if we have only 1 server */
   return (proxies[0].is_failed ? -1 : 0);
 
 
 if (nproxies == 1)             /* shortcut, if we have only 1 server */
   return (proxies[0].is_failed ? -1 : 0);
 

-/* init random */
-if (!srandomed)
-  {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  srandom((unsigned int)(tv.tv_usec/1000));
-  srandomed = TRUE;
-  }
-

 /* scan for highest pri */
 for (pri = 0, sd = proxies; sd < lim; sd++)
   if (!sd->is_failed && sd->priority > pri)
 /* scan for highest pri */
 for (pri = 0, sd = proxies; sd < lim; sd++)
   if (!sd->is_failed && sd->priority > pri)


@@ -186,7 +176,7 @@ for (weights = 0, sd = proxies; sd < lim; sd++)
 if (weights == 0)       /* all servers failed */
   return -1;
 
 if (weights == 0)       /* all servers failed */
   return -1;
 

-for (rnd = random() % weights, i = 0; i < nproxies; i++)
+for (rnd = random_number(weights), i = 0; i < nproxies; i++)

   {
   sd = &proxies[i];
   if (!sd->is_failed && sd->priority == pri)
   {
   sd = &proxies[i];
   if (!sd->is_failed && sd->priority == pri)