Logging: do not log a missing proxy address, on delivery non-proxied.

Broken-by: e6d2a9894d
(cherry picked from commit eb58ddf5828a161dec94f131ff2c5c926c868354)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 236a9cf40d1aff74c163e6980078b2bf68aa12ae..40cb14f849bec7cd3b586283a60b51e021600287 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -59,6 +59,10 @@ JH/26 Bug 2311: Fix DANE-TA verification under GnuTLS.  Previously it was also
       TLSA as an anchor.  Checking the name on the leaf cert against the name
       on the A-record for the host is still done for TA (but not for EE mode).
 
+JH/27 Fix logging of proxy address.  Previously, a pointless "PRX=[]:0" would be
+      included in delivery lines for non-proxied connections, when compiled with
+      SUPPORT_SOCKS and running with proxy logging enabled.
+
 
 Exim version 4.91
 -----------------

diff --git a/src/src/globals.c b/src/src/globals.c
index 45f49c85d9e73097a920a2506bff439d288578af..54754cc31d5a92dfc05be9d69470cba8e6bd2c41 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1053,10 +1053,10 @@ uschar *process_log_path       = NULL;
 BOOL    prod_requires_admin    = TRUE;
 
 #if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
-uschar *hosts_proxy            = US"";
-uschar *proxy_external_address = US"";
+uschar *hosts_proxy            = NULL;
+uschar *proxy_external_address = NULL;
 int     proxy_external_port    = 0;
-uschar *proxy_local_address    = US"";
+uschar *proxy_local_address    = NULL;
 int     proxy_local_port       = 0;
 BOOL    proxy_session          = FALSE;
 BOOL    proxy_session_failed   = FALSE;