From c58aa9e86ff01949c8df915478df578923dc838d Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 12 May 2014 10:58:17 +0200
Subject: [PATCH] Improve error message when execvpe() fails.

Fixes #6160
---
 lib/base/process.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index 7d6ad90e8..904961734 100644
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -500,7 +500,12 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
 		(void)nice(5);
 
 		if (icinga2_execvpe(argv[0], argv, envp) < 0) {
-			perror("execvpe() failed.");
+			char errmsg[512];
+			strcpy(errmsg, "execvpe(");
+			strncat(errmsg, argv[0], sizeof(errmsg) - 1);
+			strncat(errmsg, ") failed.", sizeof(errmsg) - 1);
+			errmsg[sizeof(errmsg) - 1] = '\0';
+			perror(errmsg);
 			_exit(128);
 		}
 
-- 
2.40.0