From 6061fbe9fe65b06d48ac7e8d0d2412ec1d91bbbd Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 8 Oct 2024 21:32:12 +0100 Subject: [PATCH] tidying --- src/src/smtp_out.c | 4 ++-- src/src/transports/smtp_socks.c | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c index 4d31ff39e..b147fdd76 100644 --- a/src/src/smtp_out.c +++ b/src/src/smtp_out.c @@ -488,9 +488,9 @@ HDEBUG(D_transport|D_acl|D_v) { gstring * g = sc->interface ? string_fmt_append(NULL, " from %s", sc->interface) - : string_get(10); + : string_get(20); #ifdef SUPPORT_SOCKS - if (ob->socks_proxy) g = string_catn(g, US"via proxy", 9); + if (ob->socks_proxy) g = string_cat(g, US" (proxy option set)"); #endif debug_printf_indent("Connecting to %s %s%Y ...\n", sc->host->name, callout_address, g); diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c index 8d4beb39a..433ad626f 100644 --- a/src/src/transports/smtp_socks.c +++ b/src/src/transports/smtp_socks.c @@ -225,14 +225,6 @@ blob proxy_early_data; if (!timeout) timeout = 24*60*60; /* use 1 day for "indefinite" */ tmo = time(NULL) + timeout; -GET_OPTION("socks_proxy"); -if (!(proxy_list = expand_string(ob->socks_proxy))) - { - log_write(0, LOG_MAIN|LOG_PANIC, "Bad expansion for socks_proxy in %s", - tb->drinst.name); - return -1; - } - /* Read proxy list */ for (nproxies = 0; -- 2.30.2