From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Thu, 1 Apr 2021 19:42:38 +0000 (+0200)
Subject: smtp_out
X-Git-Tag: exim-4.95-RC0~14^2~12
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=18d243312bf3a23bd0f464fac44797e2720e03ec;p=user%2Fhenk%2Fcode%2Fexim.git

smtp_out

(cherry picked from commit b9b967cca71a4da51506f8ba596b9ae40cfcef57)
---

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index f103c2752..4e8c44869 100644
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -53,11 +53,8 @@ if (!(expint = expand_string(istring)))
   return FALSE;
   }
 
-if (is_tainted(expint))
+if (is_tainted2(expint, LOG_MAIN|LOG_PANIC, "Tainted value '%s' from '%s' for interface", expint, istring))
   {
-  log_write(0, LOG_MAIN|LOG_PANIC,
-    "attempt to use tainted value '%s' from '%s' for interface",
-    expint, istring);
   addr->transport_return = PANIC;
   addr->message = string_sprintf("failed to expand \"interface\" "
       "option for %s: configuration error", msg);
@@ -472,7 +469,7 @@ if (ob->socks_proxy)
   {
   int sock = socks_sock_connect(sc->host, sc->host_af, port, sc->interface,
 				sc->tblock, ob->connect_timeout);
-  
+
   if (sock >= 0)
     {
     if (early_data && early_data->data && early_data->len)