JSON: remove incorrect config value check

The `u.string` member of a config entry is an array, and so never `NULL`.
Output the device string unconditionally.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
index bbc3dba5d41af1f82fadf0bee0f27caecadab5a6..798cb4842719b4de0aa8476e0fbe9631d1529de4 100644 (file)
--- a/output/ulogd_output_JSON.c
+++ b/output/ulogd_output_JSON.c
@@ -276,8 +276,8 @@ static int json_interp_file(struct ulogd_pluginstance *upi, char *buf)
 static int json_interp(struct ulogd_pluginstance *upi)
 {
        struct json_priv *opi = (struct json_priv *) &upi->private;
+       char *dvc, *buf, *tmp;
        unsigned int i;
-       char *buf, *tmp;
        size_t buflen;
        json_t *msg;
 
@@ -335,10 +335,8 @@ static int json_interp(struct ulogd_pluginstance *upi)
                        json_object_set_new(msg, "timestamp", json_string(timestr));
        }
 
-       if (upi->config_kset->ces[JSON_CONF_DEVICE].u.string) {
-               char *dvc = upi->config_kset->ces[JSON_CONF_DEVICE].u.string;
-               json_object_set_new(msg, "dvc", json_string(dvc));
-       }
+       dvc = upi->config_kset->ces[JSON_CONF_DEVICE].u.string;
+       json_object_set_new(msg, "dvc", json_string(dvc));
 
        for (i = 0; i < upi->input.num_keys; i++) {
                struct ulogd_key *key = upi->input.keys[i].u.source;