Merge pull request #2581 in SNORT/snort3 from ~SBAIGAL/snort3:late_starttls to master

Squashed commit of the following:

commit 0becc1e83d942d1bd85cb00b08a368a7264ac054
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Mon Oct 26 16:37:52 2020 -0400

    smtp: make sure the ssl search abandoned flag is preserved for reset

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index 8382f2a6fb4974ad5985f9b1dacaff0aaf4a32d3..d30466b447f798b65f9a86a0afbe08bd37f18e3a 100644 (file)
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -524,7 +524,7 @@ static void SMTP_ResetState(Flow* ssn)
 {
     SMTPData* smtp_ssn = get_session_data(ssn);
     smtp_ssn->state = STATE_COMMAND;
-    smtp_ssn->state_flags = 0;
+    smtp_ssn->state_flags = (smtp_ssn->state_flags & SMTP_FLAG_ABANDON_EVT) ? SMTP_FLAG_ABANDON_EVT : 0;
 }
 
 static inline int InspectPacket(Packet* p)