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

eve: nfs: respect global metadata config
---

diff --git a/src/output-json-nfs.c b/src/output-json-nfs.c
index fe0b8d491c..0e44c18967 100644
--- a/src/output-json-nfs.c
+++ b/src/output-json-nfs.c
@@ -54,6 +54,7 @@
 typedef struct LogNFSFileCtx_ {
     LogFileCtx *file_ctx;
     uint32_t    flags;
+    bool        include_metadata;
 } LogNFSFileCtx;
 
 typedef struct LogNFSLogThread_ {
@@ -103,6 +104,10 @@ static int JsonNFSLogger(ThreadVars *tv, void *thread_data,
         return TM_ECODE_FAILED;
     }
 
+    if (thread->nfslog_ctx->include_metadata) {
+        JsonAddMetadata(p, f, js);
+    }
+
     json_t *rpcjs = rs_rpc_log_json_response(tx);
     if (unlikely(rpcjs == NULL)) {
         goto error;
@@ -144,6 +149,7 @@ static OutputInitResult OutputNFSLogInitSub(ConfNode *conf,
         return result;
     }
     nfslog_ctx->file_ctx = ajt->file_ctx;
+    nfslog_ctx->include_metadata = ajt->include_metadata;
 
     OutputCtx *output_ctx = SCCalloc(1, sizeof(*output_ctx));
     if (unlikely(output_ctx == NULL)) {