projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.6'
[collectd.git]
/
src
/
iptables.c
diff --git
a/src/iptables.c
b/src/iptables.c
index
4d15c6e
..
9abee36
100644
(file)
--- a/
src/iptables.c
+++ b/
src/iptables.c
@@
-107,8
+107,8
@@
static int iptables_config (const char *key, const char *value)
table = fields[0];
chain = fields[1];
table = fields[0];
chain = fields[1];
- table_len = strlen (table);
- if ((unsigned int)table_len >
=
sizeof(temp.table))
+ table_len = strlen (table)
+ 1
;
+ if ((unsigned int)table_len > sizeof(temp.table))
{
ERROR ("Table `%s' too long.", table);
free (value_copy);
{
ERROR ("Table `%s' too long.", table);
free (value_copy);
@@
-116,8
+116,8
@@
static int iptables_config (const char *key, const char *value)
}
sstrncpy (temp.table, table, table_len);
}
sstrncpy (temp.table, table, table_len);
- chain_len = strlen (chain);
- if ((unsigned int)chain_len >
=
sizeof(temp.chain))
+ chain_len = strlen (chain)
+ 1
;
+ if ((unsigned int)chain_len > sizeof(temp.chain))
{
ERROR ("Chain `%s' too long.", chain);
free (value_copy);
{
ERROR ("Chain `%s' too long.", chain);
free (value_copy);
@@
-218,7
+218,6
@@
static int submit_match (const struct ipt_entry_match *match,
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
- vl.time = time (NULL);
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "iptables", sizeof (vl.plugin));
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "iptables", sizeof (vl.plugin));