eve: smtp: respect global metadata config

pull/3201/head
Jason Ish 8 years ago committed by Victor Julien
parent 7f5439a300
commit b577f4a0c9

@ -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);

Loading…
Cancel
Save