From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Thu, 1 Apr 2021 20:02:27 +0000 (+0200)
Subject: smtp
X-Git-Tag: exim-4.95-RC0~14^2~11
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=16c884a4818594069253de460bf9926f69d50fe5;p=user%2Fhenk%2Fcode%2Fexim.git

smtp

(cherry picked from commit 8b7d4ba8903ace7e3e3db70343798a5a0b7cea23)
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 264ebc094..e2b2250ad 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -5092,11 +5092,8 @@ if (!hostlist || (ob->hosts_override && ob->hosts))
     else
       if (ob->hosts_randomize) s = expanded_hosts = string_copy(s);
 
-    if (is_tainted(s))
+    if (is_tainted2(s, LOG_MAIN|LOG_PANIC, "Tainted host list '%s' from '%s' in transport %s", s, ob->hosts, tblock->name))
       {
-      log_write(0, LOG_MAIN|LOG_PANIC,
-	"attempt to use tainted host list '%s' from '%s' in transport %s",
-	s, ob->hosts, tblock->name);
       /* Avoid leaking info to an attacker */
       addrlist->message = US"internal configuration error";
       addrlist->transport_return = PANIC;