Merge branch 'collectd-5.5'

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index a75bcc0..bb1d667 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -578,6 +578,7 @@
 
 #<Plugin iptables>
 #      Chain table chain
+#      Chain6 table chain
 #</Plugin>
 
 #<Plugin irq>

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 4072d54..b992eac 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2591,9 +2591,13 @@ a notification is sent.
 
 =item B<Chain> I<Table> I<Chain> [I<Comment|Number> [I<Name>]]
 
-Select the rules to count. If only I<Table> and I<Chain> are given, this plugin
-will collect the counters of all rules which have a comment-match. The comment
-is then used as type-instance.
+=item B<Chain6> I<Table> I<Chain> [I<Comment|Number> [I<Name>]]
+
+Select the iptables/ip6tables filter rules to count packets and bytes from.
+
+If only I<Table> and I<Chain> are given, this plugin will collect the counters
+of all rules which have a comment-match. The comment is then used as
+type-instance.
 
 If I<Comment> or I<Number> is given, only the rule with the matching comment or
 the I<n>th rule will be collected. Again, the comment (or the number) will be

diff --git a/src/netapp.c b/src/netapp.c
index 020bfba..8a8a7fe 100644 (file)
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -1524,7 +1524,7 @@ static int cna_change_volume_status (const char *hostname, /* {{{ */
 {
        notification_t n;
 
-       memset (&n, 0, sizeof (&n));
+       memset (&n, 0, sizeof (n));
        n.time = cdtime ();
        sstrncpy (n.host, hostname, sizeof (n.host));
        sstrncpy (n.plugin, "netapp", sizeof (n.plugin));

diff --git a/src/openldap.c b/src/openldap.c
index ffcdb94..0a86d52 100644 (file)
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -31,6 +31,11 @@
 #include "plugin.h"
 #include "configfile.h"
 
+#if defined(__APPLE__)
+#pragma clang diagnostic push
+#pragma clang diagnostic warning "-Wdeprecated-declarations"
+#endif
+
 #include <lber.h>
 #include <ldap.h>
 
@@ -698,3 +703,7 @@ void module_register (void) /* {{{ */
        plugin_register_complex_config ("openldap", cldap_config);
        plugin_register_init ("openldap", cldap_init);
 } /* }}} void module_register */
+
+#if defined(__APPLE__)
+#pragma clang diagnostic pop
+#endif

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 4a3c345..fd5fb56 100644 (file)
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -1018,11 +1018,11 @@ static int rrd_config (const char *key, const char *value)
                        return (1);
                }
 
-               len = strlen (datadir);
-               while ((len > 0) && (datadir[len - 1] == '/'))
+               len = strlen (tmp);
+               while ((len > 0) && (tmp[len - 1] == '/'))
                {
                        len--;
-                       datadir[len] = 0;
+                       tmp[len] = 0;
                }
 
                if (len == 0)
@@ -1032,7 +1032,11 @@ static int rrd_config (const char *key, const char *value)
                        return (1);
                }
 
-               sfree (datadir);
+               if (datadir != NULL)
+               {
+                       sfree (datadir);
+               }
+
                datadir = tmp;
        }
        else if (strcasecmp ("StepSize", key) == 0)