[exim-cvs] Fix weight calculation for socks_proxy. Bug 2694

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] Fix weight calculation for socks_proxy. Bug 2694
Gitweb: https://git.exim.org/exim.git/commitdiff/83811e3c1b8189c0a725ec53df699730e7767263
Commit:     83811e3c1b8189c0a725ec53df699730e7767263
Parent:     6296a393aeab9fecc38916dfcbf1c94d54691650
Author:     Heiko Schlichting <heiko@???>
AuthorDate: Fri Feb 19 11:14:36 2021 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Feb 19 11:53:16 2021 +0000


    Fix weight calculation for socks_proxy.  Bug 2694
---
 doc/doc-txt/ChangeLog           | 4 ++--
 src/src/transports/smtp_socks.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 59fb46a..2c17877 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -204,8 +204,8 @@ JH/42 Bug 2693: Harden against a peer which reneges on a 452 "too many
       would result in both lost and duplicate recipients for a message.


 JH/43 Bug 2694: Fix weighted distribution of work to multiple spamd servers.
-      Previously the weighting was incorrectly applied.  Found and fixed by
-      Heiko Schlichting.
+      Previously the weighting was incorrectly applied.  Similar fix for socks
+      proxies.  Found and fixed by Heiko Schlichting.



 Exim version 4.94
diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c
index 41dc781..cd8ed3e 100644
--- a/src/src/transports/smtp_socks.c
+++ b/src/src/transports/smtp_socks.c
@@ -190,7 +190,7 @@ for (rnd = random() % weights, i = 0; i < nproxies; i++)
   {
   sd = &proxies[i];
   if (!sd->is_failed && sd->priority == pri)
-    if ((rnd -= sd->weight) <= 0)
+    if ((rnd -= sd->weight) < 0)
       return i;
   }