rf_get_transport

(cherry picked from commit 015fff57c854184f8bce61476c46a2830a97daf8)

diff --git a/src/src/routers/rf_get_transport.c b/src/src/routers/rf_get_transport.c
index 4a43818ff45a745b42c000976888e2d3fc289828..32bde9ec3eeef7a7f9ad7e37e581cc324eb2991f 100644 (file)
--- a/src/src/routers/rf_get_transport.c
+++ b/src/src/routers/rf_get_transport.c
@@ -66,10 +66,8 @@ if (expandable)
       "\"%s\" in %s router: %s", tpname, router_name, expand_string_message);
     return FALSE;
     }
-  if (is_tainted(ss))
+  if (is_tainted2(ss, LOG_MAIN|LOG_PANIC, "Tainted tainted value '%s' from '%s' for transport", ss, tpname))
     {
-    log_write(0, LOG_MAIN|LOG_PANIC,
-      "attempt to use tainted value '%s' from '%s' for transport", ss, tpname);
     addr->basic_errno = ERRNO_BADTRANSPORT;
     /* Avoid leaking info to an attacker */
     addr->message = US"internal configuration error";