[exim-cvs] Logging: do not log a missing proxy address, on …

Commit:     eb58ddf5828a161dec94f131ff2c5c926c868354
Parent:     5d520e57a9347e0274fdba9e70b7054d38457f96
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Wed Sep 26 10:59:05 2018 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Wed Sep 26 10:59:05 2018 +0100

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

    Broken-by: e6d2a9894d
---
 doc/doc-txt/ChangeLog | 4 ++++
 src/src/globals.c     | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5a04b1b..8d64dd4 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -125,6 +125,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 340c451..c18f6c1 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1184,10 +1184,10 @@ int     process_info_len       = 0;
 uschar *process_log_path       = NULL;

 #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;
 #endif