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.octo.it/?p=collectd.git;a=commitdiff_plain;h=d5272dbabf4c7a47f34066c05f479523d7b8beae;hp=89783745dc59079eab34e0c52de6e5e972f50eb2

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

diff --git a/src/exec.c b/src/exec.c
index b25e7697..20e65df0 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -334,7 +334,7 @@ static void exec_child (program_list_t *pl) /* {{{ */
     glist[0] = gid;
     glist_len = 1;
 
-    if (gid != egid)
+    if ((gid != egid) && (egid != -1))
     {
       glist[1] = egid;
       glist_len = 2;
diff --git a/src/perl.c b/src/perl.c
index 7558a506..6d3326fa 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -1514,6 +1514,11 @@ static int perl_config_includedir (pTHX_ oconfig_item_t *ci)
 		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 == aTHX) {
diff --git a/src/ping.c b/src/ping.c
index 05f660b3..2f7c064d 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -162,7 +162,7 @@ static int ping_config (const char *key, const char *value)
 	else if (strcasecmp (key, "ttl") == 0)
 	{
 		int ttl = atoi (value);
-		if (ping_setopt (pingobj, PING_DEF_TIMEOUT, (void *) &ttl))
+		if (ping_setopt (pingobj, PING_OPT_TTL, (void *) &ttl))
 		{
 			WARNING ("ping: liboping did not accept the TTL value %i", ttl);
 			return (1);