From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 25 Feb 2008 07:30:10 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.1~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d5272dbabf4c7a47f34066c05f479523d7b8beae;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3
---

d5272dbabf4c7a47f34066c05f479523d7b8beae
diff --cc src/perl.c
index 7558a506,50d189f8..6d3326fa
--- a/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 *));