X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;fp=src%2Fconfigfile.c;h=c5d3e3668495a8b43de6c16c82649e986878c52b;hb=09fb81e130ad70bf0547cec3d3c349ce8cb092cf;hp=0e54f267f9fdd08c15d4d4d11a427f409d708723;hpb=204cf4f8f68cadeac474a75584f27b7339aca4c4;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 0e54f267..c5d3e366 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -891,6 +891,13 @@ int global_option_set (const char *option, const char *value)
 	if (i >= cf_global_options_num)
 		return (-1);
 
+	if (strcasecmp (option, "PIDFile") == 0 && pidfile_from_cli == 1)
+	{
+		DEBUG ("Configfile: Ignoring `PIDFILE' option because "
+			"command-line option `-P' take precedence.");
+		return (0);
+	}
+
 	sfree (cf_global_options[i].value);
 
 	if (value != NULL)