Merge branch 'collectd-5.4' into collectd-5.5

diff --git a/configure.ac b/configure.ac
index 998001c..a7cddb5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3702,8 +3702,8 @@ fi
 # }}} --with-python
 
 # --with-librabbitmq {{{
-with_librabbitmq_cppflags="-I/usr/local/include"
-with_librabbitmq_ldflags="-L/usr/local/lib"
+with_librabbitmq_cppflags=""
+with_librabbitmq_ldflags=""
 AC_ARG_WITH(librabbitmq, [AS_HELP_STRING([--with-librabbitmq@<:@=PREFIX@:>@], [Path to librabbitmq.])],
 [
        if test "x$withval" != "xno" && test "x$withval" != "xyes"

diff --git a/src/routeros.c b/src/routeros.c
index 4ca9d5b..4863d7c 100644 (file)
--- a/src/routeros.c
+++ b/src/routeros.c
@@ -331,7 +331,7 @@ static int cr_config_router (oconfig_item_t *ci) /* {{{ */
   router_data = malloc (sizeof (*router_data));
   if (router_data == NULL)
     return (-1);
-  memset (router_data, 0, sizeof (router_data));
+  memset (router_data, 0, sizeof (*router_data));
   router_data->connection = NULL;
   router_data->node = NULL;
   router_data->service = NULL;