tidying

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 4d31ff39e6caad3608ea50e71ae0ec06ea61c873..b147fdd76355368bc74bc08c69669c1a42fd1a9b 100644 (file)
--- 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)
   {
   gstring * g = sc->interface
     ? string_fmt_append(NULL, " from %s", sc->interface)

-    : string_get(10);
+    : string_get(20);

 #ifdef SUPPORT_SOCKS
 #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);
 #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 8d4beb39ae1d4801c41d75b2ac619d495448eb3c..433ad626f0a737c94f7e49cd022d29d1b8523670 100644 (file)
--- 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;
 
 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;
 /* Read proxy list */
 
 for (nproxies = 0;