Early-pipe: clear unused feature bits

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index b8073b0695745ba0fe23983040e348a6668e2872..7d60d2e14ff87079a47a8d3cd559063d94e60866 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -940,11 +940,13 @@ else
     sx->ehlo_resp = er->data;
     dbfn_close(dbm_file);
     DEBUG(D_transport) debug_printf(
-       "EHLO response bits from cache: cleartext 0x%04x crypted 0x%04x\n",
-       er->data.cleartext_features, er->data.crypted_features);
+       "EHLO response bits from cache: cleartext 0x%04x/0x%04x crypted 0x%04x/0x%04x\n",
+       er->data.cleartext_features, er->data.cleartext_auths,
+       er->data.crypted_features, er->data.crypted_auths);
     return TRUE;
     }
   dbfn_close(dbm_file);
+  memset(&sx->ehlo_resp, 0, sizeof(ehlo_resp_precis));
   }
 return FALSE;
 }

diff --git a/test/stderr/4052 b/test/stderr/4052
index 0a8a7c97d3b34fa28ab0de96cef2d176a947a5a7..49e91f18a0d0ef972ca63010c31db83961d8ce8e 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -20,7 +20,7 @@ no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
 Transport port=25 replaced by host-specific port=1225
-EHLO response bits from cache: cleartext 0x0120 crypted 0x0000
+EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
 Using cached cleartext PIPE_CONNECT
   SMTP>> EHLO the.local.host.name
 using PIPELINING