From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 14 Jan 2016 17:10:30 +0000 (+0100)
Subject: MINOR: rename master process name in -Ds (systemd mode)
X-Git-Tag: v1.7-dev2~148
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ad6bde9e12a57789afd2c12d8bf4bc9fa9f3a4c;p=thirdparty%2Fhaproxy.git

MINOR: rename master process name in -Ds (systemd mode)

To avoid confusion between the master process and child processes,
the master process is renamed after the forks.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 21a5e1286d..f7b4cedf69 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1870,7 +1870,14 @@ int main(int argc, char **argv)
 
 		if (proc == global.nbproc) {
 			if (global.mode & MODE_SYSTEMD) {
+				int i;
+
 				protocol_unbind_all();
+				for (i = 1; i < argc; i++) {
+					memset(argv[i], '\0', strlen(argv[i]));
+				}
+				/* it's OK because "-Ds -f x" is the shortest form going here */
+				memcpy(argv[0] + strlen(argv[0]), "-master", 8);
 				for (proc = 0; proc < global.nbproc; proc++)
 					while (waitpid(children[proc], NULL, 0) == -1 && errno == EINTR);
 			}