Merge branch 'collectd-4.2' into collectd-4.3

diff --cc src/exec.c
Simple merge

diff --cc src/perl.c
index 7558a50638390fc7918b8d1b60420d14a2f8a3a6,50d189f8aaeb82490ff2d80d5d8a5eb37fdd4134..6d3326faebca7f89b4c5f02223c3bc5e2237ac50
--- 1/src/perl.c
--- 2/src/perl.c
+++ b/src/perl.c
@@@ -1509,14 -937,17 +1509,19 @@@ static int perl_config_includedir (pTHX
        char *value = NULL;
  
        if ((0 != ci->children_num) || (1 != ci->values_num)
 -                      || (OCONFIG_TYPE_STRING != ci->values[0].type))
 +                      || (OCONFIG_TYPE_STRING != ci->values[0].type)) {
 +              log_err ("IncludeDir expects a single string argument.");
                return 1;
 +      }
  
+       if (NULL == aTHX) {
+               log_warn ("EnableDebugger has no effects if used after LoadPlugin.");
+               return 1;
+       }
+ 
        value = ci->values[0].value.string;
  
 -      if (NULL == perl) {
 +      if (NULL == aTHX) {
                perl_argv = (char **)realloc (perl_argv,
                                (++perl_argc + 1) * sizeof (char *));