From 52b9c12f41d890cda340fe3b1c7e7e3e9d673d73 Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Wed, 10 Nov 2021 16:38:35 -0600 Subject: [PATCH] smtp: log transaction even if no email present The SMTP transaction logger was not writing the log if the email portion of the logger failed, such as in the case of STARTTLS where this is no email decoded. Ticket #4817 --- src/output-json-smtp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c index 59043518bd..5fe126f418 100644 --- a/src/output-json-smtp.c +++ b/src/output-json-smtp.c @@ -85,9 +85,8 @@ static int JsonSmtpLogger(ThreadVars *tv, void *thread_data, const Packet *p, Fl EveSmtpDataLogger(f, state, tx, tx_id, jb); jb_close(jb); - if (EveEmailLogJson(jhl, jb, p, f, state, tx, tx_id) == TM_ECODE_OK) { - OutputJsonBuilderBuffer(jb, jhl->ctx); - } + EveEmailLogJson(jhl, jb, p, f, state, tx, tx_id); + OutputJsonBuilderBuffer(jb, jhl->ctx); jb_free(jb);