summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-12-13 15:48:55 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2019-12-13 15:48:55 +0000
commitd1dc77256657ba247e65aab6ef4a6a664af18dfc (patch)
tree7e1a0a06c6dbd50240180fd0adc8c9170ec37cf7
parent39fdec3c4a4b4c1cc60cd17413b096dd07344734 (diff)
Early-pipe: clear unused feature bits
-rw-r--r--src/src/transports/smtp.c6
-rw-r--r--test/stderr/40522
2 files changed, 5 insertions, 3 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index b8073b069..7d60d2e14 100644
--- 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 0a8a7c97d..49e91f18a 100644
--- 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