eve: smtp: respect global metadata config

diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index b14f203c4f4d46c2188f9dbf668afff413a3d902..8e6fcc45d8c3dc93121279516b9a0f0e32326510 100644 (file)
--- a/src/output-json-smtp.c
+++ b/src/output-json-smtp.c
@@ -96,6 +96,10 @@ static int JsonSmtpLogger(ThreadVars *tv, void *thread_data, const Packet *p, Fl
     /* reset */
     MemBufferReset(jhl->buffer);
 
+    if (jhl->emaillog_ctx->include_metadata) {
+        JsonAddMetadata(p, f, js);
+    }
+
     sjs = JsonSmtpDataLogger(f, state, tx, tx_id);
     if (sjs) {
         json_object_set_new(js, "smtp", sjs);
@@ -207,6 +211,7 @@ static OutputInitResult OutputSmtpLogInitSub(ConfNode *conf, OutputCtx *parent_c
     }
 
     email_ctx->file_ctx = ojc->file_ctx;
+    email_ctx->include_metadata = ojc->include_metadata;
 
     OutputEmailInitConf(conf, email_ctx);