From: Jason Ish <ish@unx.ca>
Date: Mon, 11 Dec 2017 21:49:51 +0000 (-0600)
Subject: eve: smtp: respect global metadata config
X-Git-Tag: suricata-4.1.0-beta1~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b577f4a0c99e6ec6a2287f34e13fe97bd8a8287a;p=thirdparty%2Fsuricata.git

eve: smtp: respect global metadata config
---

diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index b14f203c4f..8e6fcc45d8 100644
--- 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);