[exim-cvs] smtp

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] smtp
Gitweb: https://git.exim.org/exim.git/commitdiff/16c884a4818594069253de460bf9926f69d50fe5
Commit:     16c884a4818594069253de460bf9926f69d50fe5
Parent:     18d243312bf3a23bd0f464fac44797e2720e03ec
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Thu Apr 1 22:02:27 2021 +0200
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Jun 24 21:43:15 2021 +0200


    smtp


    (cherry picked from commit 8b7d4ba8903ace7e3e3db70343798a5a0b7cea23)
---
 src/src/transports/smtp.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 264ebc0..e2b2250 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;