[exim-cvs] smtp_out

Gitweb: https://git.exim.org/exim.git/commitdiff/18d243312bf3a23bd0f464fac44797e2720e03ec

Commit:     18d243312bf3a23bd0f464fac44797e2720e03ec
Parent:     951b668a191ef510a4e27d8204c5fa82ca957a07
Author:     Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Thu Apr 1 21:42:38 2021 +0200
Committer:  Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Thu Jun 24 21:43:14 2021 +0200

    smtp_out

    (cherry picked from commit b9b967cca71a4da51506f8ba596b9ae40cfcef57)
---
 src/src/smtp_out.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index f103c27..4e8c448 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)