From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Mon, 29 Jun 2020 13:50:21 +0000 (-0400)
Subject: output/smb: Include common output options
X-Git-Tag: suricata-5.0.4~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6f7fd747a9df1de28b3b5bd581de3d90d224c5e;p=thirdparty%2Fsuricata.git

output/smb: Include common output options

This commit will cause common metadata values and the community id to be
included in log output when configured.

(cherry picked from commit c590d6f4591fc8127afc3e1468b879b5f4999875)
---

diff --git a/src/output-json-smb.c b/src/output-json-smb.c
index d5ada56d54..7f73c3b62c 100644
--- a/src/output-json-smb.c
+++ b/src/output-json-smb.c
@@ -78,6 +78,7 @@ static int JsonSMBLogger(ThreadVars *tv, void *thread_data,
     }
     json_object_set_new(js, "smb", smbjs);
 
+    JsonAddCommonOptions(&thread->ctx->cfg, p, f, js);
     MemBufferReset(thread->buffer);
     OutputJSONBuffer(js, thread->ctx->file_ctx, &thread->buffer);