X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b249717db8ced250a586385f06e61cf7107d5222..8f2cf8f5adaa08ef84b47bf9bc2f71e39236c22d:/src/src/smtp_out.c diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c index fc1e6cecd..06f6ce29c 100644 --- a/src/src/smtp_out.c +++ b/src/src/smtp_out.c @@ -53,8 +53,11 @@ if (!(expint = expand_string(istring))) return FALSE; } -if (is_tainted2(expint, LOG_MAIN|LOG_PANIC, "Tainted value '%s' from '%s' for interface", expint, istring)) +if (is_tainted(expint)) { + 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); @@ -475,7 +478,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)