summaryrefslogtreecommitdiffstats
path: root/output
diff options
context:
space:
mode:
Diffstat (limited to 'output')
-rw-r--r--output/ipfix/ulogd_output_IPFIX.c2
-rw-r--r--output/pcap/ulogd_output_PCAP.c2
-rw-r--r--output/sqlite3/ulogd_output_SQLITE3.c3
-rw-r--r--output/ulogd_output_GPRINT.c2
-rw-r--r--output/ulogd_output_GRAPHITE.c2
-rw-r--r--output/ulogd_output_JSON.c2
-rw-r--r--output/ulogd_output_LOGEMU.c2
-rw-r--r--output/ulogd_output_NACCT.c2
-rw-r--r--output/ulogd_output_OPRINT.c2
-rw-r--r--output/ulogd_output_SYSLOG.c7
-rw-r--r--output/ulogd_output_XML.c2
11 files changed, 15 insertions, 13 deletions
diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c
index 88e0035..8c8fd9d 100644
--- a/output/ipfix/ulogd_output_IPFIX.c
+++ b/output/ipfix/ulogd_output_IPFIX.c
@@ -272,7 +272,7 @@ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginsta
int oid, port, mtu, ret;
char addr[16];
- ret = config_parse_file(pi->id, pi->config_kset);
+ ret = ulogd_parse_configfile(pi->id, pi->config_kset);
if (ret < 0)
return ret;
diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index 19ce47f..474992e 100644
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -260,7 +260,7 @@ static void signal_pcap(struct ulogd_pluginstance *upi, int signal)
static int configure_pcap(struct ulogd_pluginstance *upi,
struct ulogd_pluginstance_stack *stack)
{
- return config_parse_file(upi->id, upi->config_kset);
+ return ulogd_parse_configfile(upi->id, upi->config_kset);
}
static int start_pcap(struct ulogd_pluginstance *upi)
diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
index 6aeb7a3..51c0fc8 100644
--- a/output/sqlite3/ulogd_output_SQLITE3.c
+++ b/output/sqlite3/ulogd_output_SQLITE3.c
@@ -363,7 +363,8 @@ sqlite3_configure(struct ulogd_pluginstance *pi,
{
/* struct sqlite_priv *priv = (void *)pi->private; */
- config_parse_file(pi->id, pi->config_kset);
+ if (ulogd_parse_configfile(pi->id, pi->config_kset) < 0)
+ return -1;
if (ulogd_wildcard_inputkeys(pi) < 0)
return -1;
diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index 20dd308..dfebfe2 100644
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -233,7 +233,7 @@ static int gprint_configure(struct ulogd_pluginstance *upi,
if (ret < 0)
return ret;
- ret = config_parse_file(upi->id, upi->config_kset);
+ ret = ulogd_parse_configfile(upi->id, upi->config_kset);
if (ret < 0)
return ret;
diff --git a/output/ulogd_output_GRAPHITE.c b/output/ulogd_output_GRAPHITE.c
index 5328f8e..e54b24d 100644
--- a/output/ulogd_output_GRAPHITE.c
+++ b/output/ulogd_output_GRAPHITE.c
@@ -214,7 +214,7 @@ static int configure_graphite(struct ulogd_pluginstance *pi,
struct ulogd_pluginstance_stack *stack)
{
ulogd_log(ULOGD_DEBUG, "parsing config file section %s\n", pi->id);
- return config_parse_file(pi->id, pi->config_kset);
+ return ulogd_parse_configfile(pi->id, pi->config_kset);
}
static struct ulogd_plugin graphite_plugin = {
diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
index f80d0e2..2e7211a 100644
--- a/output/ulogd_output_JSON.c
+++ b/output/ulogd_output_JSON.c
@@ -494,7 +494,7 @@ static int json_configure(struct ulogd_pluginstance *upi,
if (ret < 0)
return ret;
- ret = config_parse_file(upi->id, upi->config_kset);
+ ret = ulogd_parse_configfile(upi->id, upi->config_kset);
if (ret < 0)
return ret;
diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index cfcfab7..f5d1def 100644
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -178,7 +178,7 @@ static int configure_logemu(struct ulogd_pluginstance *pi,
struct ulogd_pluginstance_stack *stack)
{
ulogd_log(ULOGD_DEBUG, "parsing config file section %s\n", pi->id);
- return config_parse_file(pi->id, pi->config_kset);
+ return ulogd_parse_configfile(pi->id, pi->config_kset);
}
static struct ulogd_plugin logemu_plugin = {
diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c
index d369c7a..080a576 100644
--- a/output/ulogd_output_NACCT.c
+++ b/output/ulogd_output_NACCT.c
@@ -203,7 +203,7 @@ nacct_conf(struct ulogd_pluginstance *pi,
{
int ret;
- if ((ret = config_parse_file(pi->id, pi->config_kset)) < 0)
+ if ((ret = ulogd_parse_configfile(pi->id, pi->config_kset)) < 0)
return ret;
return 0;
diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index 13934ff..1137be1 100644
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -161,7 +161,7 @@ static int oprint_configure(struct ulogd_pluginstance *upi,
if (ret < 0)
return ret;
- ret = config_parse_file(upi->id, upi->config_kset);
+ ret = ulogd_parse_configfile(upi->id, upi->config_kset);
if (ret < 0)
return ret;
diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c
index 9777f0f..9ee6a61 100644
--- a/output/ulogd_output_SYSLOG.c
+++ b/output/ulogd_output_SYSLOG.c
@@ -83,12 +83,13 @@ static int _output_syslog(struct ulogd_pluginstance *upi)
static int syslog_configure(struct ulogd_pluginstance *pi,
struct ulogd_pluginstance_stack *stack)
{
- int syslog_facility, syslog_level;
+ int syslog_facility, syslog_level, ret;
char *facility, *level;
struct syslog_instance *li = (struct syslog_instance *) &pi->private;
- /* FIXME: error handling */
- config_parse_file(pi->id, pi->config_kset);
+ ret = ulogd_parse_configfile(pi->id, pi->config_kset);
+ if (ret < 0)
+ return ret;
facility = pi->config_kset->ces[0].u.string;
level = pi->config_kset->ces[1].u.string;
diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index 44af596..55c7a7c 100644
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -190,7 +190,7 @@ static int xml_configure(struct ulogd_pluginstance *upi,
{
int ret;
- ret = config_parse_file(upi->id, upi->config_kset);
+ ret = ulogd_parse_configfile(upi->id, upi->config_kset);
if (ret < 0)
return ret;
generated by cgit v1.2.3 (git 2.25.0) at 2025-08-03 05:46:00 +0000