Merge branch 'collectd-5.6'

diff --git a/src/daemon/common.c b/src/daemon/common.c
index 3d1420d62da20c5d5b8f1b02ed1f1acfa719f529..7c64796aa54a1e064d7531b77ca76da0e4c06152 100644 (file)
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -1743,7 +1743,7 @@ int check_capability (int capability) /* {{{ */
        }
 
        cap_header->pid = getpid();
-       cap_header->version = _LINUX_CAPABILITY_VERSION;
+       cap_header->version = _LINUX_CAPABILITY_VERSION_3;
        if (capget(cap_header, cap_data) < 0)
        {
                ERROR("check_capability: capget failed");

diff --git a/src/write_http.c b/src/write_http.c
index a7bb2e0f40600917685605df709a95bc7b98d885..b3baa555d2393fb7f3d48903afb5cdd4528a7c5b 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -366,7 +366,7 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
         if ((cb == NULL) || (cb->send_buffer == NULL))
                 return -1;
 
-        if (strcmp (ds->type, vl->type) == 0) {
+        if (strcmp (ds->type, vl->type) != 0) {
                 ERROR ("write_http plugin: DS type does not match "
                                 "value list type");
                 return -1;